X Tutup
Skip to content

Commit 57512c8

Browse files
yuwatayuwata
committed
tree-wide: set WRITE_STRING_FILE_DISABLE_BUFFER flag when we write files under /proc or /sys
1 parent 76cdddf commit 57512c8

File tree

14 files changed

+39
-37
lines changed

14 files changed

+39
-37
lines changed

‎src/basic/smack-util.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ int mac_smack_apply_pid(pid_t pid, const char *label) {
115115
return 0;
116116

117117
p = procfs_file_alloca(pid, "attr/current");
118-
r = write_string_file(p, label, 0);
118+
r = write_string_file(p, label, WRITE_STRING_FILE_DISABLE_BUFFER);
119119
if (r < 0)
120120
return r;
121121

‎src/basic/util.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,7 @@ void disable_coredumps(void) {
606606
if (detect_container() > 0)
607607
return;
608608

609-
r = write_string_file("/proc/sys/kernel/core_pattern", "|/bin/false", 0);
609+
r = write_string_file("/proc/sys/kernel/core_pattern", "|/bin/false", WRITE_STRING_FILE_DISABLE_BUFFER);
610610
if (r < 0)
611611
log_debug_errno(r, "Failed to turn off coredumps, ignoring: %m");
612612
}

‎src/binfmt/binfmt.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,15 @@ static int delete_rule(const char *rule) {
4747
if (!fn)
4848
return log_oom();
4949

50-
return write_string_file(fn, "-1", 0);
50+
return write_string_file(fn, "-1", WRITE_STRING_FILE_DISABLE_BUFFER);
5151
}
5252

5353
static int apply_rule(const char *rule) {
5454
int r;
5555

5656
(void) delete_rule(rule);
5757

58-
r = write_string_file("/proc/sys/fs/binfmt_misc/register", rule, 0);
58+
r = write_string_file("/proc/sys/fs/binfmt_misc/register", rule, WRITE_STRING_FILE_DISABLE_BUFFER);
5959
if (r < 0)
6060
return log_error_errno(r, "Failed to add binary format: %m");
6161

@@ -219,7 +219,7 @@ int main(int argc, char *argv[]) {
219219
}
220220

221221
/* Flush out all rules */
222-
write_string_file("/proc/sys/fs/binfmt_misc/status", "-1", 0);
222+
write_string_file("/proc/sys/fs/binfmt_misc/status", "-1", WRITE_STRING_FILE_DISABLE_BUFFER);
223223

224224
STRV_FOREACH(f, files) {
225225
k = apply_file(*f, true);

‎src/core/main.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1400,7 +1400,7 @@ static int bump_unix_max_dgram_qlen(void) {
14001400
if (v >= DEFAULT_UNIX_MAX_DGRAM_QLEN)
14011401
return 0;
14021402

1403-
r = write_string_filef("/proc/sys/net/unix/max_dgram_qlen", 0, "%lu", DEFAULT_UNIX_MAX_DGRAM_QLEN);
1403+
r = write_string_filef("/proc/sys/net/unix/max_dgram_qlen", WRITE_STRING_FILE_DISABLE_BUFFER, "%lu", DEFAULT_UNIX_MAX_DGRAM_QLEN);
14041404
if (r < 0)
14051405
return log_full_errno(IN_SET(r, -EROFS, -EPERM, -EACCES) ? LOG_DEBUG : LOG_WARNING, r,
14061406
"Failed to bump AF_UNIX datagram queue length, ignoring: %m");
@@ -1615,7 +1615,7 @@ static void initialize_core_pattern(bool skip_setup) {
16151615
if (getpid_cached() != 1)
16161616
return;
16171617

1618-
r = write_string_file("/proc/sys/kernel/core_pattern", arg_early_core_pattern, 0);
1618+
r = write_string_file("/proc/sys/kernel/core_pattern", arg_early_core_pattern, WRITE_STRING_FILE_DISABLE_BUFFER);
16191619
if (r < 0)
16201620
log_warning_errno(r, "Failed to write '%s' to /proc/sys/kernel/core_pattern, ignoring: %m", arg_early_core_pattern);
16211621
}

‎src/core/smack-setup.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -351,17 +351,17 @@ int mac_smack_setup(bool *loaded_policy) {
351351
}
352352

353353
#ifdef SMACK_RUN_LABEL
354-
r = write_string_file("/proc/self/attr/current", SMACK_RUN_LABEL, 0);
354+
r = write_string_file("/proc/self/attr/current", SMACK_RUN_LABEL, WRITE_STRING_FILE_DISABLE_BUFFER);
355355
if (r < 0)
356356
log_warning_errno(r, "Failed to set SMACK label \"" SMACK_RUN_LABEL "\" on self: %m");
357-
r = write_string_file("/sys/fs/smackfs/ambient", SMACK_RUN_LABEL, 0);
357+
r = write_string_file("/sys/fs/smackfs/ambient", SMACK_RUN_LABEL, WRITE_STRING_FILE_DISABLE_BUFFER);
358358
if (r < 0)
359359
log_warning_errno(r, "Failed to set SMACK ambient label \"" SMACK_RUN_LABEL "\": %m");
360360
r = write_string_file("/sys/fs/smackfs/netlabel",
361-
"0.0.0.0/0 " SMACK_RUN_LABEL, 0);
361+
"0.0.0.0/0 " SMACK_RUN_LABEL, WRITE_STRING_FILE_DISABLE_BUFFER);
362362
if (r < 0)
363363
log_warning_errno(r, "Failed to set SMACK netlabel rule \"0.0.0.0/0 " SMACK_RUN_LABEL "\": %m");
364-
r = write_string_file("/sys/fs/smackfs/netlabel", "127.0.0.1 -CIPSO", 0);
364+
r = write_string_file("/sys/fs/smackfs/netlabel", "127.0.0.1 -CIPSO", WRITE_STRING_FILE_DISABLE_BUFFER);
365365
if (r < 0)
366366
log_warning_errno(r, "Failed to set SMACK netlabel rule \"127.0.0.1 -CIPSO\": %m");
367367
#endif

‎src/hibernate-resume/hibernate-resume.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ int main(int argc, char *argv[]) {
4747
return EXIT_FAILURE;
4848
}
4949

50-
r = write_string_file("/sys/power/resume", major_minor, WRITE_STRING_FILE_CREATE);
50+
r = write_string_file("/sys/power/resume", major_minor, WRITE_STRING_FILE_DISABLE_BUFFER);
5151
if (r < 0) {
5252
log_error_errno(r, "Failed to write '%s' to /sys/power/resume: %m", major_minor);
5353
return EXIT_FAILURE;

‎src/login/logind-dbus.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1226,7 +1226,7 @@ static int trigger_device(Manager *m, sd_device *d) {
12261226
if (!t)
12271227
return -ENOMEM;
12281228

1229-
(void) write_string_file(t, "change", 0);
1229+
(void) write_string_file(t, "change", WRITE_STRING_FILE_DISABLE_BUFFER);
12301230
}
12311231

12321232
return 0;

‎src/network/networkd-ipv6-proxy-ndp.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ static int ipv6_proxy_ndp_set(Link *link) {
4343
v = ipv6_proxy_ndp_is_needed(link);
4444
p = strjoina("/proc/sys/net/ipv6/conf/", link->ifname, "/proxy_ndp");
4545

46-
r = write_string_file(p, one_zero(v), WRITE_STRING_FILE_VERIFY_ON_FAILURE);
46+
r = write_string_file(p, one_zero(v), WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_DISABLE_BUFFER);
4747
if (r < 0)
4848
log_link_warning_errno(link, r, "Cannot configure proxy NDP for interface: %m");
4949

‎src/network/networkd-link.c‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ static int link_enable_ipv6(Link *link) {
270270

271271
p = strjoina("/proc/sys/net/ipv6/conf/", link->ifname, "/disable_ipv6");
272272

273-
r = write_string_file(p, one_zero(disabled), WRITE_STRING_FILE_VERIFY_ON_FAILURE);
273+
r = write_string_file(p, one_zero(disabled), WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_DISABLE_BUFFER);
274274
if (r < 0)
275275
log_link_warning_errno(link, r, "Cannot %s IPv6 for interface %s: %m",
276276
enable_disable(!disabled), link->ifname);
@@ -1256,7 +1256,7 @@ static int link_set_proxy_arp(Link *link) {
12561256

12571257
p = strjoina("/proc/sys/net/ipv4/conf/", link->ifname, "/proxy_arp");
12581258

1259-
r = write_string_file(p, one_zero(link->network->proxy_arp), WRITE_STRING_FILE_VERIFY_ON_FAILURE);
1259+
r = write_string_file(p, one_zero(link->network->proxy_arp), WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_DISABLE_BUFFER);
12601260
if (r < 0)
12611261
log_link_warning_errno(link, r, "Cannot configure proxy ARP for interface: %m");
12621262

@@ -2463,7 +2463,7 @@ static int link_set_ipv4_forward(Link *link) {
24632463
* primarily to keep IPv4 and IPv6 packet forwarding behaviour
24642464
* somewhat in sync (see below). */
24652465

2466-
r = write_string_file("/proc/sys/net/ipv4/ip_forward", "1", WRITE_STRING_FILE_VERIFY_ON_FAILURE);
2466+
r = write_string_file("/proc/sys/net/ipv4/ip_forward", "1", WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_DISABLE_BUFFER);
24672467
if (r < 0)
24682468
log_link_warning_errno(link, r, "Cannot turn on IPv4 packet forwarding, ignoring: %m");
24692469

@@ -2485,7 +2485,7 @@ static int link_set_ipv6_forward(Link *link) {
24852485
* same behaviour there and also propagate the setting from
24862486
* one to all, to keep things simple (see above). */
24872487

2488-
r = write_string_file("/proc/sys/net/ipv6/conf/all/forwarding", "1", WRITE_STRING_FILE_VERIFY_ON_FAILURE);
2488+
r = write_string_file("/proc/sys/net/ipv6/conf/all/forwarding", "1", WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_DISABLE_BUFFER);
24892489
if (r < 0)
24902490
log_link_warning_errno(link, r, "Cannot configure IPv6 packet forwarding, ignoring: %m");
24912491

@@ -2505,7 +2505,7 @@ static int link_set_ipv6_privacy_extensions(Link *link) {
25052505
p = strjoina("/proc/sys/net/ipv6/conf/", link->ifname, "/use_tempaddr");
25062506
xsprintf(buf, "%u", (unsigned) link->network->ipv6_privacy_extensions);
25072507

2508-
r = write_string_file(p, buf, WRITE_STRING_FILE_VERIFY_ON_FAILURE);
2508+
r = write_string_file(p, buf, WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_DISABLE_BUFFER);
25092509
if (r < 0)
25102510
log_link_warning_errno(link, r, "Cannot configure IPv6 privacy extension for interface: %m");
25112511

@@ -2529,7 +2529,7 @@ static int link_set_ipv6_accept_ra(Link *link) {
25292529
p = strjoina("/proc/sys/net/ipv6/conf/", link->ifname, "/accept_ra");
25302530

25312531
/* We handle router advertisements ourselves, tell the kernel to GTFO */
2532-
r = write_string_file(p, "0", WRITE_STRING_FILE_VERIFY_ON_FAILURE);
2532+
r = write_string_file(p, "0", WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_DISABLE_BUFFER);
25332533
if (r < 0)
25342534
log_link_warning_errno(link, r, "Cannot disable kernel IPv6 accept_ra for interface: %m");
25352535

@@ -2557,7 +2557,7 @@ static int link_set_ipv6_dad_transmits(Link *link) {
25572557
p = strjoina("/proc/sys/net/ipv6/conf/", link->ifname, "/dad_transmits");
25582558
xsprintf(buf, "%i", link->network->ipv6_dad_transmits);
25592559

2560-
r = write_string_file(p, buf, WRITE_STRING_FILE_VERIFY_ON_FAILURE);
2560+
r = write_string_file(p, buf, WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_DISABLE_BUFFER);
25612561
if (r < 0)
25622562
log_link_warning_errno(link, r, "Cannot set IPv6 dad transmits for interface: %m");
25632563

@@ -2585,7 +2585,7 @@ static int link_set_ipv6_hop_limit(Link *link) {
25852585
p = strjoina("/proc/sys/net/ipv6/conf/", link->ifname, "/hop_limit");
25862586
xsprintf(buf, "%i", link->network->ipv6_hop_limit);
25872587

2588-
r = write_string_file(p, buf, WRITE_STRING_FILE_VERIFY_ON_FAILURE);
2588+
r = write_string_file(p, buf, WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_DISABLE_BUFFER);
25892589
if (r < 0)
25902590
log_link_warning_errno(link, r, "Cannot set IPv6 hop limit for interface: %m");
25912591

@@ -2611,7 +2611,7 @@ static int link_set_ipv6_mtu(Link *link) {
26112611

26122612
xsprintf(buf, "%" PRIu32, link->network->ipv6_mtu);
26132613

2614-
r = write_string_file(p, buf, 0);
2614+
r = write_string_file(p, buf, WRITE_STRING_FILE_DISABLE_BUFFER);
26152615
if (r < 0)
26162616
log_link_warning_errno(link, r, "Cannot set IPv6 MTU for interface: %m");
26172617

‎src/nspawn/nspawn-cgroup.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ int sync_cgroup(pid_t pid, CGroupUnified unified_requested, uid_t uid_shift) {
122122
(void) mkdir_parents(fn, 0755);
123123

124124
sprintf(pid_string, PID_FMT, pid);
125-
r = write_string_file(fn, pid_string, 0);
125+
r = write_string_file(fn, pid_string, WRITE_STRING_FILE_DISABLE_BUFFER);
126126
if (r < 0) {
127127
log_error_errno(r, "Failed to move process: %m");
128128
goto finish;

0 commit comments

Comments
 (0)
X Tutup