From: Elvis Pranskevichus <elvis@edgedb.com>
To: musl@lists.openwall.com
Cc: elvis@edgedb.com
Subject: [musl] [RESEND PATCH] ldso/dynlink: Protect LD_ env vars from getting clobbered by apps
Date: Tue, 16 Aug 2022 23:23:02 -0700 [thread overview]
Message-ID: <4834483.e9J7NaK4W3@vulcan.edgedb.net> (raw)
In-Reply-To: <3818608.tdWV9SEqCh@vulcan.edgedb.net>
(sorry, the previous patch is obviously wrong, this is a better
version)
There is no guarantee that the environment block will remain intact.
For example, PostgreSQL clobbers argv/environ area to implement its
"setproctitle" emulation on non-BSD [1], and there is a popular Python
library inspired by it [2]. As a result, setting `LD_LIBRARY_PATH`
or `LD_PRELOAD` has no effect on Postgres subprocesses when linking
against musl.
Protect against this by making a copies instead of storing the original
pointers directly.
---
ldso/dynlink.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/ldso/dynlink.c b/ldso/dynlink.c
index cc677952..2b816ce0 100644
--- a/ldso/dynlink.c
+++ b/ldso/dynlink.c
@@ -1757,7 +1757,23 @@ void __dls3(size_t *sp, size_t *auxv)
/* Only trust user/env if kernel says we're not suid/sgid */
if (!libc.secure) {
env_path = getenv("LD_LIBRARY_PATH");
+ if (env_path != NULL) {
+ /* Prevent value from getting clobbered by the application */
+ env_path = strdup(env_path);
+ if (!env_path) {
+ dprintf(2, "%s: out of memory\n", argv[0]);
+ _exit(127);
+ }
+ }
env_preload = getenv("LD_PRELOAD");
+ if (env_preload != NULL) {
+ /* Prevent value from getting clobbered by the application */
+ env_preload = strdup(env_preload);
+ if (!env_preload) {
+ dprintf(2, "%s: out of memory\n", argv[0]);
+ _exit(127);
+ }
+ }
}
/* Activate error handler function */
--
2.35.1
next prev parent reply other threads:[~2022-08-17 10:05 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-17 5:45 [musl] [PATCH] " Elvis Pranskevichus
2022-08-17 6:23 ` Elvis Pranskevichus [this message]
2022-08-17 15:29 ` Rich Felker
2022-08-17 16:26 ` Elvis Pranskevichus
2022-08-17 16:10 ` James Y Knight
2022-08-17 19:28 ` Rich Felker
2022-08-17 21:30 ` James Y Knight
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4834483.e9J7NaK4W3@vulcan.edgedb.net \
--to=elvis@edgedb.com \
--cc=musl@lists.openwall.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/musl/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).