SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

taint: don't taint if /bin, /usr/sbin, /var/run don't exist

Browse Source 
It doesn't make sense to taint a system if these fails don't exist.

A missing /usr/sbin for example doesn't indicate an unmerged-bin.
Indeed, if you have no /usr/sbin but only a /usr/bin you have a
perfectly merged bin.

(cherry picked from commit 419cf189d05e0903a233d13db444586cfb2aaf16)
This commit is contained in:
nikstur
2026-10-16 11:36:32 +01:00
committed by Luca Boccassi
parent a9868c9800
commit aba5c2df8e
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/taint.c
+7 -3
View File
@@ -35,6 +35,7 @@ static int short_uid_gid_range(UIDRangeUsernsMode mode) {
char** taint_strv(void) {
const char *stage[11] = {};
size_t n = 0;
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 known during compilation, emit a warning in the
@@ -42,15 +43,18 @@ char** taint_strv(void) {
_cleanup_free_ char *bin = NULL, *usr_sbin = NULL, *var_run = NULL;
if (readlink_malloc("/bin", &bin) < 0 || !PATH_IN_SET(bin, "usr/bin", "/usr/bin"))
r = readlink_malloc("/bin", &bin);
if (r != -ENOENT && (r < 0 || !PATH_IN_SET(bin, "usr/bin", "/usr/bin")))
stage[n++] = "unmerged-usr";
/* Note that the check is different from default_PATH(), as we want to taint on uncanonical symlinks
* too. */
if (readlink_malloc("/usr/sbin", &usr_sbin) < 0 || !PATH_IN_SET(usr_sbin, "bin", "/usr/bin"))
r = readlink_malloc("/usr/sbin", &usr_sbin);
if (r != -ENOENT && (r < 0 || !PATH_IN_SET(usr_sbin, "bin", "/usr/bin")))
stage[n++] = "unmerged-bin";
if (readlink_malloc("/var/run", &var_run) < 0 || !PATH_IN_SET(var_run, "../run", "/run"))
r = readlink_malloc("/var/run", &var_run);
if (r != -ENOENT && (r < 0 || !PATH_IN_SET(var_run, "../run", "/run")))
stage[n++] = "var-run-bad";
if (clock_is_localtime(NULL) > 0)