emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

sysctl: do not report set key in case close_stream fails

Browse Source 
As we're using buffered I/O when writing kernel parameters, write errors
may get delayed until we close the `FILE` stream. As we are currently
outputting the key that is to be set disregarding the return value of
`close_stream`, we may end up in a situation where we report error and
success:

    $ sysctl kernel.printk_ratelimit=100000000000000
    sysctl: setting key "kernel.printk_ratelimit": error code 22
    kernel.printk_ratelimit = 100000000000000

Fix the issue by only outputting the updated value in case
`close_stream` does not report an error.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
This commit is contained in:
Patrick Steinhardt
2018-05-29 13:29:03 +02:00
committed by Craig Small
parent 3eb4b5375f
commit da82fe49b1
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sysctl.c
View File

@@ -465,7 +465,7 @@ static int WriteSetting(const char *setting)
rc = 0; rc = 0;
if (close_stream(fp) != 0) if (close_stream(fp) != 0)
xwarn(_("setting key \"%s\""), outname); xwarn(_("setting key \"%s\""), outname);
if (rc == 0 && !Quiet) { else if (rc == 0 && !Quiet) {
if (NameOnly) { if (NameOnly) {
fprintf(stdout, "%s\n", outname); fprintf(stdout, "%s\n", outname);
} else { } else {