From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
To: libc-alpha@sourceware.org, Siddhesh Poyarekar <siddhesh@sourceware.org>
Subject: [PATCH v2 14/19] elf: Ignore loader debug env vars for setuid
Date: Tue, 17 Oct 2023 10:05:21 -0300 [thread overview]
Message-ID: <20231017130526.2216827-15-adhemerval.zanella@linaro.org> (raw)
In-Reply-To: <20231017130526.2216827-1-adhemerval.zanella@linaro.org>
Loader already ignores LD_DEBUG, LD_DEBUG_OUTPUT, and
LD_TRACE_LOADED_OBJECTS. Both LD_WARN and LD_VERBOSE are similar to
LD_DEBUG, in the sense they enable additional checks and debug
information, so it makes sense to disable them.
Checked on x86_64-linux-gnu.
---
elf/rtld.c | 22 ++++++++++++++--------
elf/tst-env-setuid.c | 2 ++
2 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/elf/rtld.c b/elf/rtld.c
index a09cf2a9df..8749ad6288 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -2552,13 +2552,15 @@ process_envvars (struct dl_main_state *state)
{
case 4:
/* Warning level, verbose or not. */
- if (memcmp (envline, "WARN", 4) == 0)
+ if (!!__libc_enable_secure
+ && memcmp (envline, "WARN", 4) == 0)
GLRO(dl_verbose) = envline[5] != '\0';
break;
case 5:
/* Debugging of the dynamic linker? */
- if (memcmp (envline, "DEBUG", 5) == 0)
+ if (!__libc_enable_secure
+ && memcmp (envline, "DEBUG", 5) == 0)
{
process_dl_debug (state, &envline[6]);
break;
@@ -2569,7 +2571,8 @@ process_envvars (struct dl_main_state *state)
case 7:
/* Print information about versions. */
- if (memcmp (envline, "VERBOSE", 7) == 0)
+ if (!__libc_enable_secure
+ && memcmp (envline, "VERBOSE", 7) == 0)
{
state->version_info = envline[8] != '\0';
break;
@@ -2625,7 +2628,8 @@ process_envvars (struct dl_main_state *state)
}
/* Where to place the profiling data file. */
- if (memcmp (envline, "DEBUG_OUTPUT", 12) == 0)
+ if (!__libc_enable_secure
+ && memcmp (envline, "DEBUG_OUTPUT", 12) == 0)
{
debug_output = &envline[13];
break;
@@ -2646,7 +2650,8 @@ process_envvars (struct dl_main_state *state)
case 20:
/* The mode of the dynamic linker can be set. */
- if (memcmp (envline, "TRACE_LOADED_OBJECTS", 20) == 0)
+ if (!__libc_enable_secure
+ && memcmp (envline, "TRACE_LOADED_OBJECTS", 20) == 0)
{
state->mode = rtld_mode_trace;
state->mode_trace_program
@@ -2668,9 +2673,10 @@ process_envvars (struct dl_main_state *state)
}
while (*nextp != '\0');
- GLRO(dl_debug_mask) = 0;
-
- if (state->mode != rtld_mode_normal)
+ if (GLRO(dl_debug_mask) != 0
+ || GLRO(dl_verbose) != 0
+ || state->mode != rtld_mode_normal
+ || state->version_info)
_exit (5);
}
/* If we have to run the dynamic linker in debugging mode and the
diff --git a/elf/tst-env-setuid.c b/elf/tst-env-setuid.c
index 76b8e1fb45..dcf213a4cd 100644
--- a/elf/tst-env-setuid.c
+++ b/elf/tst-env-setuid.c
@@ -59,6 +59,8 @@ static const struct envvar_t filtered_envvars[] =
{ "MALLOC_TRACE", FILTERED_VALUE },
{ "MALLOC_TRIM_THRESHOLD_", FILTERED_VALUE },
{ "RES_OPTIONS", FILTERED_VALUE },
+ { "LD_DEBUG", "all" },
+ { "LD_DEBUG_OUTPUT", "/tmp/some-file" },
};
static const struct envvar_t unfiltered_envvars[] =
--
2.34.1
next prev parent reply other threads:[~2023-10-17 13:06 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-17 13:05 [PATCH v2 00/19] Improve loader environment variable handling Adhemerval Zanella
2023-10-17 13:05 ` [PATCH v2 01/19] elf: Remove /etc/suid-debug support Adhemerval Zanella
2023-10-18 12:31 ` Siddhesh Poyarekar
2023-10-18 18:27 ` Adhemerval Zanella Netto
2023-10-17 13:05 ` [PATCH v2 02/19] elf: Add GLIBC_TUNABLES to unsecvars Adhemerval Zanella
2023-10-18 12:52 ` Siddhesh Poyarekar
2023-10-17 13:05 ` [PATCH v2 03/19] elf: Ignore GLIBC_TUNABLES for setuid/setgid binaries Adhemerval Zanella
2023-10-18 13:04 ` Siddhesh Poyarekar
2023-10-27 10:38 ` Siddhesh Poyarekar
2023-10-28 2:14 ` DJ Delorie
2023-10-30 16:51 ` Adhemerval Zanella Netto
2023-10-17 13:05 ` [PATCH v2 04/19] elf: Add all malloc tunable to unsecvars Adhemerval Zanella
2023-10-18 13:04 ` Siddhesh Poyarekar
2023-10-27 10:38 ` Siddhesh Poyarekar
2023-10-28 3:45 ` DJ Delorie
2023-10-17 13:05 ` [PATCH v2 05/19] elf: Do not process invalid tunable format Adhemerval Zanella
2023-10-18 13:42 ` Siddhesh Poyarekar
2023-10-17 13:05 ` [PATCH v2 06/19] elf: Do not parse ill-formatted strings Adhemerval Zanella
2023-10-27 10:25 ` Siddhesh Poyarekar
2023-10-27 12:51 ` Adhemerval Zanella Netto
2023-10-17 13:05 ` [PATCH v2 07/19] elf: Fix _dl_debug_vdprintf to work before self-relocation Adhemerval Zanella
2023-10-27 10:27 ` Siddhesh Poyarekar
2023-10-17 13:05 ` [PATCH v2 08/19] elf: Emit warning if tunable is ill-formatted Adhemerval Zanella
2023-10-27 10:28 ` Siddhesh Poyarekar
2023-10-27 12:51 ` Adhemerval Zanella Netto
2023-10-17 13:05 ` [PATCH v2 09/19] x86: Use dl-symbol-redir-ifunc.h on cpu-tunables Adhemerval Zanella
2023-10-27 10:32 ` Siddhesh Poyarekar
2023-10-17 13:05 ` [PATCH v2 10/19] s390: " Adhemerval Zanella
2023-10-27 10:34 ` Siddhesh Poyarekar
2023-10-17 13:05 ` [PATCH v2 11/19] elf: Do not duplicate the GLIBC_TUNABLES string Adhemerval Zanella
2023-10-27 11:54 ` Siddhesh Poyarekar
2023-10-30 18:24 ` Adhemerval Zanella Netto
2023-10-17 13:05 ` [PATCH v2 12/19] elf: Ignore LD_PROFILE for setuid binaries Adhemerval Zanella
2023-10-27 14:25 ` Siddhesh Poyarekar
2023-12-12 10:11 ` Florian Weimer
2023-10-17 13:05 ` [PATCH v2 13/19] elf: Remove LD_PROFILE for static binaries Adhemerval Zanella
2023-10-17 13:05 ` Adhemerval Zanella [this message]
2023-10-17 13:05 ` [PATCH v2 15/19] elf: Remove any_debug from dl_main_state Adhemerval Zanella
2023-10-27 14:26 ` Siddhesh Poyarekar
2023-10-30 19:03 ` Adhemerval Zanella Netto
2023-10-17 13:05 ` [PATCH v2 16/19] elf: Ignore LD_LIBRARY_PATH and debug env var for setuid for static Adhemerval Zanella
2023-10-17 13:05 ` [PATCH v2 17/19] elf: Add comments on how LD_AUDIT and LD_PRELOAD handle __libc_enable_secure Adhemerval Zanella
2023-10-27 14:31 ` Siddhesh Poyarekar
2023-10-17 13:05 ` [PATCH v2 18/19] elf: Ignore LD_BIND_NOW and LD_BIND_NOT for setuid binaries Adhemerval Zanella
2023-10-17 13:05 ` [PATCH v2 19/19] elf: Refactor process_envvars Adhemerval Zanella
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=20231017130526.2216827-15-adhemerval.zanella@linaro.org \
--to=adhemerval.zanella@linaro.org \
--cc=libc-alpha@sourceware.org \
--cc=siddhesh@sourceware.org \
/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.
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 read-only IMAP folder(s) and NNTP newsgroup(s).