morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-15 17:06:39 +09:00
Code Issues Packages Projects Releases Wiki Activity

sysctl-util: rework sysctl_write() to wrap write_string_file()

Browse Source 
The sysctl_write_ip_property() call already uses write_string_file(), so
let's do so here, too, to make the codepaths more uniform.

While we are at it, let's also validate the passed path a bit, since we
shouldn't allow sysctls with /../ or such in the name. Hence simplify
the path first, and then check if it is normalized, and refuse if not.
This commit is contained in:
Lennart Poettering
2021-09-14 23:19:38 +02:00
parent be991d7678
commit 13239c86e0
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/basic/sysctl-util.c
View File

@@ -44,25 +44,19 @@ char *sysctl_normalize(char *s) {
int sysctl_write(const char *property, const char *value) {
char *p;
_cleanup_close_ int fd = -1;
assert(property);
assert(value);
log_debug("Setting '%s' to '%.*s'.", property, (int) strcspn(value, NEWLINE), value);
p = strjoina("/proc/sys/", property);
fd = open(p, O_WRONLY|O_CLOEXEC);
if (fd < 0)
return -errno;
if (!endswith(value, "\n"))
value = strjoina(value, "\n");
path_simplify(p);
if (!path_is_normalized(p))
return -EINVAL;
if (write(fd, value, strlen(value)) < 0)
return -errno;
log_debug("Setting '%s' to '%s'", p, value);
return 0;
return write_string_file(p, value, WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_DISABLE_BUFFER);
}
int sysctl_writef(const char *property, const char *format, ...) {