| From 26da484391e20b36eb65c98872d1145261028c7a Mon Sep 17 00:00:00 2001 |
| From: Chen Qi <Qi.Chen@windriver.com> |
| Date: Fri, 1 Mar 2019 15:22:15 +0800 |
| Subject: [PATCH] do not disable buffer in writing files |
| |
| Do not disable buffer in writing files, otherwise we get |
| failure at boot for musl like below. |
| |
| [!!!!!!] Failed to allocate manager object. |
| |
| And there will be other failures, critical or not critical. |
| This is specific to musl. |
| |
| Upstream-Status: Inappropriate [musl] |
| |
| Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
| [Rebased for v242] |
| Signed-off-by: Andrej Valek <andrej.valek@siemens.com> |
| [rebased for systemd 243] |
| Signed-off-by: Scott Murray <scott.murray@konsulko.com> |
| |
| --- |
| src/basic/cgroup-util.c | 10 +++++----- |
| src/basic/procfs-util.c | 4 ++-- |
| src/basic/sysctl-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/libsystemd/sd-device/sd-device.c | 2 +- |
| src/nspawn/nspawn-cgroup.c | 2 +- |
| src/nspawn/nspawn.c | 6 +++--- |
| src/shared/cgroup-setup.c | 4 ++-- |
| src/shared/mount-util.c | 4 ++-- |
| src/shared/smack-util.c | 2 +- |
| src/sleep/sleep.c | 8 ++++---- |
| src/vconsole/vconsole-setup.c | 2 +- |
| 16 files changed, 34 insertions(+), 34 deletions(-) |
| |
| diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c |
| index c9efd862a2..b3708ea925 100644 |
| --- a/src/basic/cgroup-util.c |
| +++ b/src/basic/cgroup-util.c |
| @@ -766,7 +766,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { |
| |
| sc = strstrip(contents); |
| if (isempty(sc)) { |
| - r = write_string_file(fs, agent, WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file(fs, agent, 0); |
| if (r < 0) |
| return r; |
| } else if (!path_equal(sc, agent)) |
| @@ -784,7 +784,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { |
| |
| sc = strstrip(contents); |
| if (streq(sc, "0")) { |
| - r = write_string_file(fs, "1", WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file(fs, "1", 0); |
| if (r < 0) |
| return r; |
| |
| @@ -811,7 +811,7 @@ int cg_uninstall_release_agent(const char *controller) { |
| if (r < 0) |
| return r; |
| |
| - r = write_string_file(fs, "0", WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file(fs, "0", 0); |
| if (r < 0) |
| return r; |
| |
| @@ -821,7 +821,7 @@ int cg_uninstall_release_agent(const char *controller) { |
| if (r < 0) |
| return r; |
| |
| - r = write_string_file(fs, "", WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file(fs, "", 0); |
| if (r < 0) |
| return r; |
| |
| @@ -1651,7 +1651,7 @@ int cg_set_attribute(const char *controller, const char *path, const char *attri |
| if (r < 0) |
| return r; |
| |
| - return write_string_file(p, value, WRITE_STRING_FILE_DISABLE_BUFFER); |
| + return write_string_file(p, value, 0); |
| } |
| |
| int cg_get_attribute(const char *controller, const char *path, const char *attribute, char **ret) { |
| diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c |
| index 8c57094225..0cf6ec752b 100644 |
| --- a/src/basic/procfs-util.c |
| +++ b/src/basic/procfs-util.c |
| @@ -86,13 +86,13 @@ int procfs_tasks_set_limit(uint64_t limit) { |
| * decrease it, as threads-max is the much more relevant sysctl. */ |
| if (limit > pid_max-1) { |
| sprintf(buffer, "%" PRIu64, limit+1); /* Add one, since PID 0 is not a valid PID */ |
| - r = write_string_file("/proc/sys/kernel/pid_max", buffer, WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file("/proc/sys/kernel/pid_max", buffer, 0); |
| if (r < 0) |
| return r; |
| } |
| |
| sprintf(buffer, "%" PRIu64, limit); |
| - r = write_string_file("/proc/sys/kernel/threads-max", buffer, WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file("/proc/sys/kernel/threads-max", buffer, 0); |
| if (r < 0) { |
| uint64_t threads_max; |
| |
| diff --git a/src/basic/sysctl-util.c b/src/basic/sysctl-util.c |
| index 8913e6ff85..29e6ec0755 100644 |
| --- a/src/basic/sysctl-util.c |
| +++ b/src/basic/sysctl-util.c |
| @@ -93,7 +93,7 @@ int sysctl_write_ip_property(int af, const char *ifname, const char *property, c |
| |
| log_debug("Setting '%s' to '%s'", p, value); |
| |
| - return write_string_file(p, value, WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_DISABLE_BUFFER); |
| + return write_string_file(p, value, WRITE_STRING_FILE_VERIFY_ON_FAILURE | 0); |
| } |
| |
| int sysctl_read(const char *property, char **ret) { |
| diff --git a/src/basic/util.c b/src/basic/util.c |
| index 955b18bd2a..6d89c90176 100644 |
| --- a/src/basic/util.c |
| +++ b/src/basic/util.c |
| @@ -234,7 +234,7 @@ void disable_coredumps(void) { |
| if (detect_container() > 0) |
| return; |
| |
| - r = write_string_file("/proc/sys/kernel/core_pattern", "|/bin/false", WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file("/proc/sys/kernel/core_pattern", "|/bin/false", 0); |
| 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 29530bb691..3ecf6a45a2 100644 |
| --- a/src/binfmt/binfmt.c |
| +++ b/src/binfmt/binfmt.c |
| @@ -48,7 +48,7 @@ static int delete_rule(const char *rule) { |
| if (!fn) |
| return log_oom(); |
| |
| - return write_string_file(fn, "-1", WRITE_STRING_FILE_DISABLE_BUFFER); |
| + return write_string_file(fn, "-1", 0); |
| } |
| |
| static int apply_rule(const char *rule) { |
| @@ -56,7 +56,7 @@ static int apply_rule(const char *rule) { |
| |
| (void) delete_rule(rule); |
| |
| - r = write_string_file("/proc/sys/fs/binfmt_misc/register", rule, WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file("/proc/sys/fs/binfmt_misc/register", rule, 0); |
| if (r < 0) |
| return log_error_errno(r, "Failed to add binary format: %m"); |
| |
| @@ -223,7 +223,7 @@ static int run(int argc, char *argv[]) { |
| } |
| |
| /* Flush out all rules */ |
| - (void) write_string_file("/proc/sys/fs/binfmt_misc/status", "-1", WRITE_STRING_FILE_DISABLE_BUFFER); |
| + (void) write_string_file("/proc/sys/fs/binfmt_misc/status", "-1", 0); |
| |
| STRV_FOREACH(f, files) { |
| k = apply_file(*f, true); |
| diff --git a/src/core/main.c b/src/core/main.c |
| index c64c73883e..1ac185e946 100644 |
| --- a/src/core/main.c |
| +++ b/src/core/main.c |
| @@ -1402,7 +1402,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", WRITE_STRING_FILE_DISABLE_BUFFER, "%lu", DEFAULT_UNIX_MAX_DGRAM_QLEN); |
| + r = write_string_filef("/proc/sys/net/unix/max_dgram_qlen", 0, "%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"); |
| @@ -1679,7 +1679,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, WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file("/proc/sys/kernel/core_pattern", arg_early_core_pattern, 0); |
| 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 79c4808473..b111ce0a11 100644 |
| --- a/src/core/smack-setup.c |
| +++ b/src/core/smack-setup.c |
| @@ -323,17 +323,17 @@ int mac_smack_setup(bool *loaded_policy) { |
| } |
| |
| #ifdef SMACK_RUN_LABEL |
| - r = write_string_file("/proc/self/attr/current", SMACK_RUN_LABEL, WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file("/proc/self/attr/current", SMACK_RUN_LABEL, 0); |
| 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, WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file("/sys/fs/smackfs/ambient", SMACK_RUN_LABEL, 0); |
| 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, WRITE_STRING_FILE_DISABLE_BUFFER); |
| + "0.0.0.0/0 " SMACK_RUN_LABEL, 0); |
| 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", WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file("/sys/fs/smackfs/netlabel", "127.0.0.1 -CIPSO", 0); |
| 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 58e35e403e..1d0beb4008 100644 |
| --- a/src/hibernate-resume/hibernate-resume.c |
| +++ b/src/hibernate-resume/hibernate-resume.c |
| @@ -45,7 +45,7 @@ int main(int argc, char *argv[]) { |
| return EXIT_FAILURE; |
| } |
| |
| - r = write_string_file("/sys/power/resume", major_minor, WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file("/sys/power/resume", major_minor, 0); |
| 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/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c |
| index 388128bf33..695f535ff4 100644 |
| --- a/src/libsystemd/sd-device/sd-device.c |
| +++ b/src/libsystemd/sd-device/sd-device.c |
| @@ -2096,7 +2096,7 @@ _public_ int sd_device_set_sysattr_value(sd_device *device, const char *sysattr, |
| if (!value) |
| return -ENOMEM; |
| |
| - r = write_string_file(path, value, WRITE_STRING_FILE_DISABLE_BUFFER | WRITE_STRING_FILE_NOFOLLOW); |
| + r = write_string_file(path, value, 0 | WRITE_STRING_FILE_NOFOLLOW); |
| if (r < 0) { |
| /* On failure, clear cache entry, as we do not know how it fails. */ |
| device_remove_cached_sysattr_value(device, sysattr); |
| diff --git a/src/nspawn/nspawn-cgroup.c b/src/nspawn/nspawn-cgroup.c |
| index cb01b25bc6..e92051268b 100644 |
| --- a/src/nspawn/nspawn-cgroup.c |
| +++ b/src/nspawn/nspawn-cgroup.c |
| @@ -124,7 +124,7 @@ int sync_cgroup(pid_t pid, CGroupUnified unified_requested, uid_t uid_shift) { |
| fn = strjoina(tree, cgroup, "/cgroup.procs"); |
| |
| sprintf(pid_string, PID_FMT, pid); |
| - r = write_string_file(fn, pid_string, WRITE_STRING_FILE_DISABLE_BUFFER|WRITE_STRING_FILE_MKDIR_0755); |
| + r = write_string_file(fn, pid_string, WRITE_STRING_FILE_MKDIR_0755); |
| 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 ff08ed23cc..e7c4a874a9 100644 |
| --- a/src/nspawn/nspawn.c |
| +++ b/src/nspawn/nspawn.c |
| @@ -2751,7 +2751,7 @@ static int reset_audit_loginuid(void) { |
| if (streq(p, "4294967295")) |
| return 0; |
| |
| - r = write_string_file("/proc/self/loginuid", "4294967295", WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file("/proc/self/loginuid", "4294967295", 0); |
| if (r < 0) { |
| log_error_errno(r, |
| "Failed to reset audit login UID. This probably means that your kernel is too\n" |
| @@ -4148,7 +4148,7 @@ static int setup_uid_map( |
| return log_oom(); |
| |
| xsprintf(uid_map, "/proc/" PID_FMT "/uid_map", pid); |
| - r = write_string_file(uid_map, s, WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file(uid_map, s, 0); |
| if (r < 0) |
| return log_error_errno(r, "Failed to write UID map: %m"); |
| |
| @@ -4158,7 +4158,7 @@ static int setup_uid_map( |
| return log_oom(); |
| |
| xsprintf(uid_map, "/proc/" PID_FMT "/gid_map", pid); |
| - r = write_string_file(uid_map, s, WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file(uid_map, s, 0); |
| if (r < 0) |
| return log_error_errno(r, "Failed to write GID map: %m"); |
| |
| diff --git a/src/shared/cgroup-setup.c b/src/shared/cgroup-setup.c |
| index f197f715c7..077f893177 100644 |
| --- a/src/shared/cgroup-setup.c |
| +++ b/src/shared/cgroup-setup.c |
| @@ -267,7 +267,7 @@ int cg_attach(const char *controller, const char *path, pid_t pid) { |
| |
| xsprintf(c, PID_FMT "\n", pid); |
| |
| - r = write_string_file(fs, c, WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file(fs, c, 0); |
| if (r < 0) |
| return r; |
| |
| @@ -799,7 +799,7 @@ int cg_enable_everywhere( |
| return log_debug_errno(errno, "Failed to open cgroup.subtree_control file of %s: %m", p); |
| } |
| |
| - r = write_string_stream(f, s, WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_stream(f, s, 0); |
| if (r < 0) { |
| log_debug_errno(r, "Failed to %s controller %s for %s (%s): %m", |
| FLAGS_SET(mask, bit) ? "enable" : "disable", n, p, fs); |
| diff --git a/src/shared/mount-util.c b/src/shared/mount-util.c |
| index 594efea989..d243b45bc4 100644 |
| --- a/src/shared/mount-util.c |
| +++ b/src/shared/mount-util.c |
| @@ -1019,13 +1019,13 @@ static int make_userns(uid_t uid_shift, uid_t uid_range) { |
| xsprintf(line, UID_FMT " " UID_FMT " " UID_FMT "\n", 0, uid_shift, uid_range); |
| |
| xsprintf(uid_map, "/proc/" PID_FMT "/uid_map", pid); |
| - r = write_string_file(uid_map, line, WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file(uid_map, line, 0); |
| 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, WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file(uid_map, line, 0); |
| if (r < 0) |
| return log_error_errno(r, "Failed to write GID map: %m"); |
| |
| diff --git a/src/shared/smack-util.c b/src/shared/smack-util.c |
| index 3362ee3924..80c0f2a52e 100644 |
| --- a/src/shared/smack-util.c |
| +++ b/src/shared/smack-util.c |
| @@ -114,7 +114,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, WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file(p, label, 0); |
| if (r < 0) |
| return r; |
| |
| diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c |
| index a3aeb24633..d3e68e1b94 100644 |
| --- a/src/sleep/sleep.c |
| +++ b/src/sleep/sleep.c |
| @@ -46,7 +46,7 @@ static int write_hibernate_location_info(const HibernateLocation *hibernate_loca |
| assert(hibernate_location->swap); |
| |
| xsprintf(resume_str, "%u:%u", major(hibernate_location->devno), minor(hibernate_location->devno)); |
| - r = write_string_file("/sys/power/resume", resume_str, WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file("/sys/power/resume", resume_str, 0); |
| if (r < 0) |
| return log_debug_errno(r, "Failed to write partition device to /sys/power/resume for '%s': '%s': %m", |
| hibernate_location->swap->device, resume_str); |
| @@ -73,7 +73,7 @@ static int write_hibernate_location_info(const HibernateLocation *hibernate_loca |
| } |
| |
| xsprintf(offset_str, "%" PRIu64, hibernate_location->offset); |
| - r = write_string_file("/sys/power/resume_offset", offset_str, WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file("/sys/power/resume_offset", offset_str, 0); |
| if (r < 0) |
| return log_debug_errno(r, "Failed to write swap file offset to /sys/power/resume_offset for '%s': '%s': %m", |
| hibernate_location->swap->device, offset_str); |
| @@ -90,7 +90,7 @@ static int write_mode(char **modes) { |
| STRV_FOREACH(mode, modes) { |
| int k; |
| |
| - k = write_string_file("/sys/power/disk", *mode, WRITE_STRING_FILE_DISABLE_BUFFER); |
| + k = write_string_file("/sys/power/disk", *mode, 0); |
| if (k >= 0) |
| return 0; |
| |
| @@ -112,7 +112,7 @@ static int write_state(FILE **f, char **states) { |
| STRV_FOREACH(state, states) { |
| int k; |
| |
| - k = write_string_stream(*f, *state, WRITE_STRING_FILE_DISABLE_BUFFER); |
| + k = write_string_stream(*f, *state, 0); |
| if (k >= 0) |
| return 0; |
| log_debug_errno(k, "Failed to write '%s' to /sys/power/state: %m", *state); |
| diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c |
| index d1c3febdd5..1cc68694d1 100644 |
| --- a/src/vconsole/vconsole-setup.c |
| +++ b/src/vconsole/vconsole-setup.c |
| @@ -116,7 +116,7 @@ static int toggle_utf8_vc(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), WRITE_STRING_FILE_DISABLE_BUFFER); |
| + r = write_string_file("/sys/module/vt/parameters/default_utf8", one_zero(utf8), 0); |
| if (r < 0) |
| return log_warning_errno(r, "Failed to %s sysfs UTF-8 flag: %m", enable_disable(utf8)); |
| |