shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-07 01:27:11 +03:00
Code

core: drop taints for nobody user/group names

Browse Source 
We have a check and warning at compile time. The user cannot do anything about
this at runtime, and all other taints are about checks that happen at runtime
and are specific to that system (and at least potentially correctable).

(The logic in the compilation-time check was updated to treat "nogroup" as OK,
but not the runtime check. But I think it's better to remove the runtime check
for this altogether, so this becomes moot.)
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2017-12-14 12:44:21 +01:00
parent 966c04cf01
commit 198ce93248
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/core/manager.c
View File

@ -3872,14 +3872,17 @@ char *manager_taint_string(Manager *m) {
char *buf, *e; char *buf, *e;
int r; int r;
/* Returns a "taint string", e.g. "local-hwclock:var-run-bad".
* Only things that are detected at runtime should be tagged
* here. For stuff that is set during compilation, emit a warning
* in the configuration phase. */
assert(m); assert(m);
buf = new(char, sizeof("split-usr:" buf = new(char, sizeof("split-usr:"
"cgroups-missing:" "cgroups-missing:"
"local-hwclock:" "local-hwclock:"
"var-run-bad:" "var-run-bad:"
"weird-nobody-user:"
"weird-nobody-group:"
"overflowuid-not-65534:" "overflowuid-not-65534:"
"overflowgid-not-65534:")); "overflowgid-not-65534:"));
if (!buf) if (!buf)
@ -3901,12 +3904,6 @@ char *manager_taint_string(Manager *m) {
if (r < 0 || !PATH_IN_SET(destination, "../run", "/run")) if (r < 0 || !PATH_IN_SET(destination, "../run", "/run"))
e = stpcpy(e, "var-run-bad:"); e = stpcpy(e, "var-run-bad:");
if (!streq(NOBODY_USER_NAME, "nobody"))
e = stpcpy(e, "weird-nobody-user:");
if (!streq(NOBODY_GROUP_NAME, "nobody"))
e = stpcpy(e, "weird-nobody-group:");
r = read_one_line_file("/proc/sys/kernel/overflowuid", &overflowuid); r = read_one_line_file("/proc/sys/kernel/overflowuid", &overflowuid);
if (r >= 0 && !streq(overflowuid, "65534")) if (r >= 0 && !streq(overflowuid, "65534"))
e = stpcpy(e, "overflowuid-not-65534:"); e = stpcpy(e, "overflowuid-not-65534:");