From 92c40e1dc825b90f64c22b2e994f3a69e802f089 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 6 Nov 2018 12:58:29 +0900 Subject: [PATCH 1/5] udevadm: use write_string_file() helper function --- src/udev/udevadm-trigger.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/udev/udevadm-trigger.c b/src/udev/udevadm-trigger.c index 66ed0aee591..185fe29be02 100644 --- a/src/udev/udevadm-trigger.c +++ b/src/udev/udevadm-trigger.c @@ -8,6 +8,7 @@ #include "device-enumerator-private.h" #include "fd-util.h" +#include "fileio.h" #include "path-util.h" #include "set.h" #include "string-util.h" @@ -24,7 +25,6 @@ static int exec_list(sd_device_enumerator *e, const char *action, Set *settle_se FOREACH_DEVICE_AND_SUBSYSTEM(e, d) { _cleanup_free_ char *filename = NULL; - _cleanup_close_ int fd = -1; const char *syspath; if (sd_device_get_syspath(d, &syspath) < 0) @@ -39,18 +39,17 @@ static int exec_list(sd_device_enumerator *e, const char *action, Set *settle_se if (!filename) return log_oom(); - fd = open(filename, O_WRONLY|O_CLOEXEC); - if (fd < 0) + r = write_string_file(filename, action, WRITE_STRING_FILE_DISABLE_BUFFER); + if (r < 0) { + log_debug_errno(r, "Failed to write '%s' to '%s', ignoring: %m", action, filename); continue; + } if (settle_set) { r = set_put_strdup(settle_set, syspath); if (r < 0) return log_oom(); } - - if (write(fd, action, strlen(action)) < 0) - log_debug_errno(errno, "Failed to write '%s' to '%s', ignoring: %m", action, filename); } return 0; From 76cdddfb9d7cf0c7a03201f981ab17fc96c2340d Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 6 Nov 2018 20:28:25 +0900 Subject: [PATCH 2/5] udevd: use set_oom_score_adjust() to set OOM score --- src/udev/udevd.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/udev/udevd.c b/src/udev/udevd.c index 42a492cc59e..3ce20f49547 100644 --- a/src/udev/udevd.c +++ b/src/udev/udevd.c @@ -395,7 +395,9 @@ static void worker_spawn(Manager *manager, struct event *event) { (void) prctl(PR_SET_PDEATHSIG, SIGTERM); /* Reset OOM score, we only protect the main daemon. */ - write_string_file("/proc/self/oom_score_adj", "0", 0); + r = set_oom_score_adjust(0); + if (r < 0) + log_debug_errno(r, "Failed to reset OOM score, ignoring: %m"); for (;;) { _cleanup_(udev_event_freep) struct udev_event *udev_event = NULL; @@ -1791,7 +1793,9 @@ int main(int argc, char *argv[]) { setsid(); - write_string_file("/proc/self/oom_score_adj", "-1000", 0); + r = set_oom_score_adjust(-1000); + if (r < 0) + log_debug_errno(r, "Failed to adjust OOM score, ignoring: %m"); } r = run(fd_ctrl, fd_uevent, cgroup); From 57512c893eacbafdad5d91df43ac4cd43b328993 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 6 Nov 2018 21:00:07 +0900 Subject: [PATCH 3/5] tree-wide: set WRITE_STRING_FILE_DISABLE_BUFFER flag when we write files under /proc or /sys --- src/basic/smack-util.c | 2 +- src/basic/util.c | 2 +- src/binfmt/binfmt.c | 6 +++--- src/core/main.c | 4 ++-- src/core/smack-setup.c | 8 ++++---- src/hibernate-resume/hibernate-resume.c | 2 +- src/login/logind-dbus.c | 2 +- src/network/networkd-ipv6-proxy-ndp.c | 2 +- src/network/networkd-link.c | 18 +++++++++--------- src/nspawn/nspawn-cgroup.c | 2 +- src/nspawn/nspawn.c | 6 +++--- src/sleep/sleep.c | 14 ++++++++------ src/udev/udevd.c | 6 +++--- src/vconsole/vconsole-setup.c | 2 +- 14 files changed, 39 insertions(+), 37 deletions(-) diff --git a/src/basic/smack-util.c b/src/basic/smack-util.c index e7ea78f3498..123d00e13ee 100644 --- a/src/basic/smack-util.c +++ b/src/basic/smack-util.c @@ -115,7 +115,7 @@ int mac_smack_apply_pid(pid_t pid, const char *label) { return 0; p = procfs_file_alloca(pid, "attr/current"); - r = write_string_file(p, label, 0); + r = write_string_file(p, label, WRITE_STRING_FILE_DISABLE_BUFFER); if (r < 0) return r; diff --git a/src/basic/util.c b/src/basic/util.c index 0da963f4af8..b6e874c3b86 100644 --- a/src/basic/util.c +++ b/src/basic/util.c @@ -606,7 +606,7 @@ void disable_coredumps(void) { if (detect_container() > 0) return; - r = write_string_file("/proc/sys/kernel/core_pattern", "|/bin/false", 0); + r = write_string_file("/proc/sys/kernel/core_pattern", "|/bin/false", WRITE_STRING_FILE_DISABLE_BUFFER); if (r < 0) log_debug_errno(r, "Failed to turn off coredumps, ignoring: %m"); } diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c index fb8cf13f239..0dd202d086e 100644 --- a/src/binfmt/binfmt.c +++ b/src/binfmt/binfmt.c @@ -47,7 +47,7 @@ static int delete_rule(const char *rule) { if (!fn) return log_oom(); - return write_string_file(fn, "-1", 0); + return write_string_file(fn, "-1", WRITE_STRING_FILE_DISABLE_BUFFER); } static int apply_rule(const char *rule) { @@ -55,7 +55,7 @@ static int apply_rule(const char *rule) { (void) delete_rule(rule); - r = write_string_file("/proc/sys/fs/binfmt_misc/register", rule, 0); + r = write_string_file("/proc/sys/fs/binfmt_misc/register", rule, WRITE_STRING_FILE_DISABLE_BUFFER); if (r < 0) return log_error_errno(r, "Failed to add binary format: %m"); @@ -219,7 +219,7 @@ int main(int argc, char *argv[]) { } /* Flush out all rules */ - write_string_file("/proc/sys/fs/binfmt_misc/status", "-1", 0); + write_string_file("/proc/sys/fs/binfmt_misc/status", "-1", WRITE_STRING_FILE_DISABLE_BUFFER); STRV_FOREACH(f, files) { k = apply_file(*f, true); diff --git a/src/core/main.c b/src/core/main.c index 807f5457c28..bb46969302c 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -1400,7 +1400,7 @@ static int bump_unix_max_dgram_qlen(void) { if (v >= DEFAULT_UNIX_MAX_DGRAM_QLEN) return 0; - r = write_string_filef("/proc/sys/net/unix/max_dgram_qlen", 0, "%lu", DEFAULT_UNIX_MAX_DGRAM_QLEN); + r = write_string_filef("/proc/sys/net/unix/max_dgram_qlen", WRITE_STRING_FILE_DISABLE_BUFFER, "%lu", DEFAULT_UNIX_MAX_DGRAM_QLEN); if (r < 0) return log_full_errno(IN_SET(r, -EROFS, -EPERM, -EACCES) ? LOG_DEBUG : LOG_WARNING, r, "Failed to bump AF_UNIX datagram queue length, ignoring: %m"); @@ -1615,7 +1615,7 @@ static void initialize_core_pattern(bool skip_setup) { if (getpid_cached() != 1) return; - r = write_string_file("/proc/sys/kernel/core_pattern", arg_early_core_pattern, 0); + r = write_string_file("/proc/sys/kernel/core_pattern", arg_early_core_pattern, WRITE_STRING_FILE_DISABLE_BUFFER); if (r < 0) log_warning_errno(r, "Failed to write '%s' to /proc/sys/kernel/core_pattern, ignoring: %m", arg_early_core_pattern); } diff --git a/src/core/smack-setup.c b/src/core/smack-setup.c index 47138b863a1..4e9506f09cf 100644 --- a/src/core/smack-setup.c +++ b/src/core/smack-setup.c @@ -351,17 +351,17 @@ int mac_smack_setup(bool *loaded_policy) { } #ifdef SMACK_RUN_LABEL - r = write_string_file("/proc/self/attr/current", SMACK_RUN_LABEL, 0); + r = write_string_file("/proc/self/attr/current", SMACK_RUN_LABEL, WRITE_STRING_FILE_DISABLE_BUFFER); if (r < 0) log_warning_errno(r, "Failed to set SMACK label \"" SMACK_RUN_LABEL "\" on self: %m"); - r = write_string_file("/sys/fs/smackfs/ambient", SMACK_RUN_LABEL, 0); + r = write_string_file("/sys/fs/smackfs/ambient", SMACK_RUN_LABEL, WRITE_STRING_FILE_DISABLE_BUFFER); if (r < 0) log_warning_errno(r, "Failed to set SMACK ambient label \"" SMACK_RUN_LABEL "\": %m"); r = write_string_file("/sys/fs/smackfs/netlabel", - "0.0.0.0/0 " SMACK_RUN_LABEL, 0); + "0.0.0.0/0 " SMACK_RUN_LABEL, WRITE_STRING_FILE_DISABLE_BUFFER); if (r < 0) log_warning_errno(r, "Failed to set SMACK netlabel rule \"0.0.0.0/0 " SMACK_RUN_LABEL "\": %m"); - r = write_string_file("/sys/fs/smackfs/netlabel", "127.0.0.1 -CIPSO", 0); + r = write_string_file("/sys/fs/smackfs/netlabel", "127.0.0.1 -CIPSO", WRITE_STRING_FILE_DISABLE_BUFFER); if (r < 0) log_warning_errno(r, "Failed to set SMACK netlabel rule \"127.0.0.1 -CIPSO\": %m"); #endif diff --git a/src/hibernate-resume/hibernate-resume.c b/src/hibernate-resume/hibernate-resume.c index 397757fa464..abbf3572919 100644 --- a/src/hibernate-resume/hibernate-resume.c +++ b/src/hibernate-resume/hibernate-resume.c @@ -47,7 +47,7 @@ int main(int argc, char *argv[]) { return EXIT_FAILURE; } - r = write_string_file("/sys/power/resume", major_minor, WRITE_STRING_FILE_CREATE); + r = write_string_file("/sys/power/resume", major_minor, WRITE_STRING_FILE_DISABLE_BUFFER); if (r < 0) { log_error_errno(r, "Failed to write '%s' to /sys/power/resume: %m", major_minor); return EXIT_FAILURE; diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c index 032504e63a9..927e304a0ca 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c @@ -1226,7 +1226,7 @@ static int trigger_device(Manager *m, sd_device *d) { if (!t) return -ENOMEM; - (void) write_string_file(t, "change", 0); + (void) write_string_file(t, "change", WRITE_STRING_FILE_DISABLE_BUFFER); } return 0; diff --git a/src/network/networkd-ipv6-proxy-ndp.c b/src/network/networkd-ipv6-proxy-ndp.c index cb25812260f..6286b37debb 100644 --- a/src/network/networkd-ipv6-proxy-ndp.c +++ b/src/network/networkd-ipv6-proxy-ndp.c @@ -43,7 +43,7 @@ static int ipv6_proxy_ndp_set(Link *link) { v = ipv6_proxy_ndp_is_needed(link); p = strjoina("/proc/sys/net/ipv6/conf/", link->ifname, "/proxy_ndp"); - r = write_string_file(p, one_zero(v), WRITE_STRING_FILE_VERIFY_ON_FAILURE); + r = write_string_file(p, one_zero(v), WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_DISABLE_BUFFER); if (r < 0) log_link_warning_errno(link, r, "Cannot configure proxy NDP for interface: %m"); diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index c4923980e39..08bfa6db8f7 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -270,7 +270,7 @@ static int link_enable_ipv6(Link *link) { p = strjoina("/proc/sys/net/ipv6/conf/", link->ifname, "/disable_ipv6"); - r = write_string_file(p, one_zero(disabled), WRITE_STRING_FILE_VERIFY_ON_FAILURE); + r = write_string_file(p, one_zero(disabled), WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_DISABLE_BUFFER); if (r < 0) log_link_warning_errno(link, r, "Cannot %s IPv6 for interface %s: %m", enable_disable(!disabled), link->ifname); @@ -1256,7 +1256,7 @@ static int link_set_proxy_arp(Link *link) { p = strjoina("/proc/sys/net/ipv4/conf/", link->ifname, "/proxy_arp"); - r = write_string_file(p, one_zero(link->network->proxy_arp), WRITE_STRING_FILE_VERIFY_ON_FAILURE); + r = write_string_file(p, one_zero(link->network->proxy_arp), WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_DISABLE_BUFFER); if (r < 0) log_link_warning_errno(link, r, "Cannot configure proxy ARP for interface: %m"); @@ -2463,7 +2463,7 @@ static int link_set_ipv4_forward(Link *link) { * primarily to keep IPv4 and IPv6 packet forwarding behaviour * somewhat in sync (see below). */ - r = write_string_file("/proc/sys/net/ipv4/ip_forward", "1", WRITE_STRING_FILE_VERIFY_ON_FAILURE); + r = write_string_file("/proc/sys/net/ipv4/ip_forward", "1", WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_DISABLE_BUFFER); if (r < 0) log_link_warning_errno(link, r, "Cannot turn on IPv4 packet forwarding, ignoring: %m"); @@ -2485,7 +2485,7 @@ static int link_set_ipv6_forward(Link *link) { * same behaviour there and also propagate the setting from * one to all, to keep things simple (see above). */ - r = write_string_file("/proc/sys/net/ipv6/conf/all/forwarding", "1", WRITE_STRING_FILE_VERIFY_ON_FAILURE); + r = write_string_file("/proc/sys/net/ipv6/conf/all/forwarding", "1", WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_DISABLE_BUFFER); if (r < 0) log_link_warning_errno(link, r, "Cannot configure IPv6 packet forwarding, ignoring: %m"); @@ -2505,7 +2505,7 @@ static int link_set_ipv6_privacy_extensions(Link *link) { p = strjoina("/proc/sys/net/ipv6/conf/", link->ifname, "/use_tempaddr"); xsprintf(buf, "%u", (unsigned) link->network->ipv6_privacy_extensions); - r = write_string_file(p, buf, WRITE_STRING_FILE_VERIFY_ON_FAILURE); + r = write_string_file(p, buf, WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_DISABLE_BUFFER); if (r < 0) log_link_warning_errno(link, r, "Cannot configure IPv6 privacy extension for interface: %m"); @@ -2529,7 +2529,7 @@ static int link_set_ipv6_accept_ra(Link *link) { p = strjoina("/proc/sys/net/ipv6/conf/", link->ifname, "/accept_ra"); /* We handle router advertisements ourselves, tell the kernel to GTFO */ - r = write_string_file(p, "0", WRITE_STRING_FILE_VERIFY_ON_FAILURE); + r = write_string_file(p, "0", WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_DISABLE_BUFFER); if (r < 0) log_link_warning_errno(link, r, "Cannot disable kernel IPv6 accept_ra for interface: %m"); @@ -2557,7 +2557,7 @@ static int link_set_ipv6_dad_transmits(Link *link) { p = strjoina("/proc/sys/net/ipv6/conf/", link->ifname, "/dad_transmits"); xsprintf(buf, "%i", link->network->ipv6_dad_transmits); - r = write_string_file(p, buf, WRITE_STRING_FILE_VERIFY_ON_FAILURE); + r = write_string_file(p, buf, WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_DISABLE_BUFFER); if (r < 0) log_link_warning_errno(link, r, "Cannot set IPv6 dad transmits for interface: %m"); @@ -2585,7 +2585,7 @@ static int link_set_ipv6_hop_limit(Link *link) { p = strjoina("/proc/sys/net/ipv6/conf/", link->ifname, "/hop_limit"); xsprintf(buf, "%i", link->network->ipv6_hop_limit); - r = write_string_file(p, buf, WRITE_STRING_FILE_VERIFY_ON_FAILURE); + r = write_string_file(p, buf, WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_DISABLE_BUFFER); if (r < 0) log_link_warning_errno(link, r, "Cannot set IPv6 hop limit for interface: %m"); @@ -2611,7 +2611,7 @@ static int link_set_ipv6_mtu(Link *link) { xsprintf(buf, "%" PRIu32, link->network->ipv6_mtu); - r = write_string_file(p, buf, 0); + r = write_string_file(p, buf, WRITE_STRING_FILE_DISABLE_BUFFER); if (r < 0) log_link_warning_errno(link, r, "Cannot set IPv6 MTU for interface: %m"); diff --git a/src/nspawn/nspawn-cgroup.c b/src/nspawn/nspawn-cgroup.c index 8732c9e2aa9..0a54d27e6a6 100644 --- a/src/nspawn/nspawn-cgroup.c +++ b/src/nspawn/nspawn-cgroup.c @@ -122,7 +122,7 @@ int sync_cgroup(pid_t pid, CGroupUnified unified_requested, uid_t uid_shift) { (void) mkdir_parents(fn, 0755); sprintf(pid_string, PID_FMT, pid); - r = write_string_file(fn, pid_string, 0); + r = write_string_file(fn, pid_string, WRITE_STRING_FILE_DISABLE_BUFFER); if (r < 0) { log_error_errno(r, "Failed to move process: %m"); goto finish; diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index de14b63bd76..ab19d73c272 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -2176,7 +2176,7 @@ static int reset_audit_loginuid(void) { if (streq(p, "4294967295")) return 0; - r = write_string_file("/proc/self/loginuid", "4294967295", 0); + r = write_string_file("/proc/self/loginuid", "4294967295", WRITE_STRING_FILE_DISABLE_BUFFER); if (r < 0) { log_error_errno(r, "Failed to reset audit login UID. This probably means that your kernel is too\n" @@ -3265,13 +3265,13 @@ static int setup_uid_map(pid_t pid) { xsprintf(uid_map, "/proc/" PID_FMT "/uid_map", pid); xsprintf(line, UID_FMT " " UID_FMT " " UID_FMT "\n", 0, arg_uid_shift, arg_uid_range); - r = write_string_file(uid_map, line, 0); + r = write_string_file(uid_map, line, WRITE_STRING_FILE_DISABLE_BUFFER); if (r < 0) return log_error_errno(r, "Failed to write UID map: %m"); /* We always assign the same UID and GID ranges */ xsprintf(uid_map, "/proc/" PID_FMT "/gid_map", pid); - r = write_string_file(uid_map, line, 0); + r = write_string_file(uid_map, line, WRITE_STRING_FILE_DISABLE_BUFFER); if (r < 0) return log_error_errno(r, "Failed to write GID map: %m"); diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c index a4eba598514..198d45c9024 100644 --- a/src/sleep/sleep.c +++ b/src/sleep/sleep.c @@ -42,7 +42,7 @@ static int write_hibernate_location_info(void) { /* if it's a swap partition, we just write the disk to /sys/power/resume */ if (streq(type, "partition")) { - r = write_string_file("/sys/power/resume", device, 0); + r = write_string_file("/sys/power/resume", device, WRITE_STRING_FILE_DISABLE_BUFFER); if (r < 0) return log_debug_errno(r, "Faileed to write partitoin device to /sys/power/resume: %m"); @@ -80,12 +80,12 @@ static int write_hibernate_location_info(void) { offset = fiemap->fm_extents[0].fe_physical / page_size(); xsprintf(offset_str, "%" PRIu64, offset); - r = write_string_file("/sys/power/resume_offset", offset_str, 0); + r = write_string_file("/sys/power/resume_offset", offset_str, WRITE_STRING_FILE_DISABLE_BUFFER); if (r < 0) return log_debug_errno(r, "Failed to write offset '%s': %m", offset_str); xsprintf(device_str, "%lx", (unsigned long)stb.st_dev); - r = write_string_file("/sys/power/resume", device_str, 0); + r = write_string_file("/sys/power/resume", device_str, WRITE_STRING_FILE_DISABLE_BUFFER); if (r < 0) return log_debug_errno(r, "Failed to write device '%s': %m", device_str); @@ -99,7 +99,7 @@ static int write_mode(char **modes) { STRV_FOREACH(mode, modes) { int k; - k = write_string_file("/sys/power/disk", *mode, 0); + k = write_string_file("/sys/power/disk", *mode, WRITE_STRING_FILE_DISABLE_BUFFER); if (k >= 0) return 0; @@ -118,7 +118,7 @@ static int write_state(FILE **f, char **states) { STRV_FOREACH(state, states) { int k; - k = write_string_stream(*f, *state, 0); + k = write_string_stream(*f, *state, WRITE_STRING_FILE_DISABLE_BUFFER); if (k >= 0) return 0; log_debug_errno(k, "Failed to write '%s' to /sys/power/state: %m", *state); @@ -155,6 +155,8 @@ static int execute(char **modes, char **states) { if (!f) return log_error_errno(errno, "Failed to open /sys/power/state: %m"); + setvbuf(f, NULL, _IONBF, 0); + /* Configure the hibernation mode */ if (!strv_isempty(modes)) { r = write_hibernate_location_info(); @@ -211,7 +213,7 @@ static int rtc_write_wake_alarm(uint64_t sec) { xsprintf(buf, "%" PRIu64, sec); - r = write_string_file("/sys/class/rtc/rtc0/wakealarm", buf, 0); + r = write_string_file("/sys/class/rtc/rtc0/wakealarm", buf, WRITE_STRING_FILE_DISABLE_BUFFER); if (r < 0) return log_error_errno(r, "Failed to write '%s' to /sys/class/rtc/rtc0/wakealarm: %m", buf); diff --git a/src/udev/udevd.c b/src/udev/udevd.c index 3ce20f49547..8bc07050129 100644 --- a/src/udev/udevd.c +++ b/src/udev/udevd.c @@ -1123,7 +1123,7 @@ static int synthesize_change(sd_device *dev) { */ log_debug("Device '%s' is closed, synthesising 'change'", devname); strscpyl(filename, sizeof(filename), syspath, "/uevent", NULL); - write_string_file(filename, "change", WRITE_STRING_FILE_CREATE); + write_string_file(filename, "change", WRITE_STRING_FILE_DISABLE_BUFFER); FOREACH_DEVICE(e, d) { const char *t, *n, *s; @@ -1138,7 +1138,7 @@ static int synthesize_change(sd_device *dev) { log_debug("Device '%s' is closed, synthesising partition '%s' 'change'", devname, n); strscpyl(filename, sizeof(filename), s, "/uevent", NULL); - write_string_file(filename, "change", WRITE_STRING_FILE_CREATE); + write_string_file(filename, "change", WRITE_STRING_FILE_DISABLE_BUFFER); } return 0; @@ -1146,7 +1146,7 @@ static int synthesize_change(sd_device *dev) { log_debug("Device %s is closed, synthesising 'change'", devname); strscpyl(filename, sizeof(filename), syspath, "/uevent", NULL); - write_string_file(filename, "change", WRITE_STRING_FILE_CREATE); + write_string_file(filename, "change", WRITE_STRING_FILE_DISABLE_BUFFER); return 0; } diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c index f162d29220f..4c55ed7cb54 100644 --- a/src/vconsole/vconsole-setup.c +++ b/src/vconsole/vconsole-setup.c @@ -112,7 +112,7 @@ static int toggle_utf8(const char *name, int fd, bool utf8) { static int toggle_utf8_sysfs(bool utf8) { int r; - r = write_string_file("/sys/module/vt/parameters/default_utf8", one_zero(utf8), 0); + r = write_string_file("/sys/module/vt/parameters/default_utf8", one_zero(utf8), WRITE_STRING_FILE_DISABLE_BUFFER); if (r < 0) return log_warning_errno(r, "Failed to %s sysfs UTF-8 flag: %m", enable_disable(utf8)); From 835d18ba20525f8ae41f643e8531e0e67f87bfd0 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 6 Nov 2018 21:23:03 +0900 Subject: [PATCH 4/5] fileio: introduce WRITE_STRING_FILE_NOFOLLOW flag for write_string_file() and friends --- src/basic/fileio.c | 2 +- src/basic/fileio.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/basic/fileio.c b/src/basic/fileio.c index f14afa5dce4..fa6084e602a 100644 --- a/src/basic/fileio.c +++ b/src/basic/fileio.c @@ -160,7 +160,7 @@ int write_string_file_ts( /* We manually build our own version of fopen(..., "we") that * works without O_CREAT */ - fd = open(fn, O_WRONLY|O_CLOEXEC|O_NOCTTY); + fd = open(fn, O_WRONLY|O_CLOEXEC|O_NOCTTY | ((flags & WRITE_STRING_FILE_NOFOLLOW) ? O_NOFOLLOW : 0)); if (fd < 0) { r = -errno; goto fail; diff --git a/src/basic/fileio.h b/src/basic/fileio.h index 102d33d75f2..f8098484080 100644 --- a/src/basic/fileio.h +++ b/src/basic/fileio.h @@ -17,6 +17,7 @@ typedef enum { WRITE_STRING_FILE_VERIFY_ON_FAILURE = 1 << 3, WRITE_STRING_FILE_SYNC = 1 << 4, WRITE_STRING_FILE_DISABLE_BUFFER = 1 << 5, + WRITE_STRING_FILE_NOFOLLOW = 1 << 6, /* And before you wonder, why write_string_file_atomic_label_ts() is a separate function instead of just one more flag here: it's about linking: we don't want to pull -lselinux into all users of write_string_file() From 7cadbe09e9dca1f89ae40103ca75e865d375b1b9 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 6 Nov 2018 21:23:52 +0900 Subject: [PATCH 5/5] sd-device: use write_string_file() helper to write sysattr --- src/libsystemd/sd-device/sd-device.c | 51 ++++++++++++---------------- 1 file changed, 21 insertions(+), 30 deletions(-) diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c index d0f5e1efcf5..a7cab464d87 100644 --- a/src/libsystemd/sd-device/sd-device.c +++ b/src/libsystemd/sd-device/sd-device.c @@ -1827,12 +1827,9 @@ static void device_remove_sysattr_value(sd_device *device, const char *_key) { /* set the attribute and save it in the cache. If a NULL value is passed the * attribute is cleared from the cache */ _public_ int sd_device_set_sysattr_value(sd_device *device, const char *sysattr, const char *_value) { - _cleanup_close_ int fd = -1; _cleanup_free_ char *value = NULL; - const char *syspath; - char *path; - size_t len = 0; - ssize_t size; + const char *syspath, *path; + size_t len; int r; assert_return(device, -EINVAL); @@ -1850,25 +1847,6 @@ _public_ int sd_device_set_sysattr_value(sd_device *device, const char *sysattr, path = strjoina(syspath, "/", sysattr); - fd = open(path, O_WRONLY | O_CLOEXEC | O_NOFOLLOW); - if (fd < 0) { - if (errno == ELOOP) - return -EINVAL; - if (errno == EISDIR) - return -EISDIR; - - value = strdup(""); - if (!value) - return -ENOMEM; - - r = device_add_sysattr_value(device, sysattr, value); - if (r < 0) - return r; - value = NULL; - - return -ENXIO; - } - len = strlen(_value); /* drop trailing newlines */ @@ -1883,17 +1861,30 @@ _public_ int sd_device_set_sysattr_value(sd_device *device, const char *sysattr, if (!value) return -ENOMEM; - size = write(fd, value, len); - if (size < 0) - return -errno; + r = write_string_file(path, value, WRITE_STRING_FILE_DISABLE_BUFFER | WRITE_STRING_FILE_NOFOLLOW); + if (r < 0) { + if (r == -ELOOP) + return -EINVAL; + if (r == -EISDIR) + return r; - if ((size_t)size != len) - return -EIO; + free(value); + value = strdup(""); + if (!value) + return -ENOMEM; + + r = device_add_sysattr_value(device, sysattr, value); + if (r < 0) + return r; + + value = NULL; + return -ENXIO; + } r = device_add_sysattr_value(device, sysattr, value); if (r < 0) return r; - value = NULL; + value = NULL; return 0; }