From: Rich Felker <dalias@aerifal.cx>
Date: Wed, 7 Feb 2018 19:31:42 +0000 (-0500)
Subject: disallow non-absolute rpath $ORIGIN for suid/sgid/AT_SECURE processes
X-Git-Tag: v1.1.19~8
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=376b3c54bba7d235e5a8e2839bb333a826b19636;p=oweals%2Fmusl.git

disallow non-absolute rpath $ORIGIN for suid/sgid/AT_SECURE processes

in theory non-absolute origins can only arise when either the main
program is invoked by running ldso as a command (inherently non-suid)
or when dlopen was called with a relative pathname containing at least
one slash. such usage would be inherently insecure in an suid program
anyway, so the old behavior here does not seem to have been insecure.
harden against it anyway.
---

diff --git a/ldso/dynlink.c b/ldso/dynlink.c
index 3741c30d..9bf6924b 100644
--- a/ldso/dynlink.c
+++ b/ldso/dynlink.c
@@ -817,6 +817,9 @@ static int fixup_rpath(struct dso *p, char *buf, size_t buf_size)
 		origin = ".";
 		l = 1;
 	}
+	/* Disallow non-absolute origins for suid/sgid/AT_SECURE. */
+	if (libc.secure && *origin != '/')
+		return 0;
 	p->rpath = malloc(strlen(p->rpath_orig) + n*l + 1);
 	if (!p->rpath) return -1;