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

sysctl: Return non-zero if param setting failed

Browse Source 
Real usecase:
'sysctl -w user.max_uts_namespaces=2147483648; echo $?'
returns 0 even though it failed with EINVAL

The close_stream() realised there was an issue and printed an
error but didn't change the return value.

Slightly modified merge request.

References:
 procps-ng/procps!76

Signed-off-by: Craig Small <csmall@dropbear.xyz>
This commit is contained in:
Jan Rybar 2021-09-15 21:07:43 +10:00 committed by Craig Small
parent e886010ef7
commit 08aa15ce4b
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -14,6 +14,7 @@ procps-ng-NEXT
* slabtop: Don't combine d and o options issue #160 * slabtop: Don't combine d and o options issue #160
* sysctl: Add support for systemd glob patterns issue #191 * sysctl: Add support for systemd glob patterns issue #191
* sysctl: Check resolved path to be under /proc/sys issue #179 * sysctl: Check resolved path to be under /proc/sys issue #179
* sysctl: return non-zero if EINVAL return for write merge #76
* top: added LOGID similar to 3.3.13 ps LUID * top: added LOGID similar to 3.3.13 ps LUID
* top: added EXE identical to 3.3.17 ps EXE * top: added EXE identical to 3.3.17 ps EXE
* top: exploit some library smaps_rollup provisions issue #112 * top: exploit some library smaps_rollup provisions issue #112

2
sysctl.c
View File

@ -586,7 +586,7 @@ static int WriteSetting(
rc = EXIT_SUCCESS; rc = EXIT_SUCCESS;
if (close_stream(fp) != 0) { if (close_stream(fp) != 0) {
xwarn(_("setting key \"%s\""), path); xwarn(_("setting key \"%s\""), path);
return rc; return EXIT_FAILURE;
} }
} }
} }