From: Fangrui Song <maskray@google.com>
To: libc-alpha@sourceware.org, Florian Weimer <fweimer@redhat.com>
Subject: [PATCH] elf: Remove __libc_enable_secure_decided
Date: Sun, 17 Apr 2022 15:52:40 -0700 [thread overview]
Message-ID: <20220417225240.1656529-1-maskray@google.com> (raw)
No functional change. __libc_enable_secure_decided is always 0 since
73fc4e28b9464f0e13edc719a5372839970e7ddb.
---
elf/enbl-secure.c | 7 ++-----
include/unistd.h | 1 -
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/elf/enbl-secure.c b/elf/enbl-secure.c
index aa2a0bd877..6a0a6d0f0f 100644
--- a/elf/enbl-secure.c
+++ b/elf/enbl-secure.c
@@ -26,15 +26,12 @@
#include <startup.h>
#include <libc-internal.h>
-/* If nonzero __libc_enable_secure is already set. */
-int __libc_enable_secure_decided;
/* Safest assumption, if somehow the initializer isn't run. */
int __libc_enable_secure = 1;
void
__libc_init_secure (void)
{
- if (__libc_enable_secure_decided == 0)
- __libc_enable_secure = (startup_geteuid () != startup_getuid ()
- || startup_getegid () != startup_getgid ());
+ __libc_enable_secure = (startup_geteuid () != startup_getuid ()
+ || startup_getegid () != startup_getgid ());
}
diff --git a/include/unistd.h b/include/unistd.h
index 7090169601..af795a37c8 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -192,7 +192,6 @@ libc_hidden_proto (__tcsetpgrp)
and some functions contained in the C library ignore various
environment variables that normally affect them. */
extern int __libc_enable_secure attribute_relro;
-extern int __libc_enable_secure_decided;
rtld_hidden_proto (__libc_enable_secure)
--
2.36.0.rc0.470.gd361397f0d-goog
next reply other threads:[~2022-04-17 22:52 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-17 22:52 Fangrui Song [this message]
2022-04-18 10:00 ` Florian Weimer
2022-04-18 23:49 ` Fāng-ruì Sòng
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=20220417225240.1656529-1-maskray@google.com \
--to=maskray@google.com \
--cc=fweimer@redhat.com \
--cc=libc-alpha@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).