From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2178) id 427273857025; Tue, 17 May 2022 09:57:54 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 427273857025 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Florian Weimer To: glibc-cvs@sourceware.org Subject: [glibc/release/2.35/master] Linux: Remove HAVE_AUX_SECURE, HAVE_AUX_XID, HAVE_AUX_PAGESIZE X-Act-Checkin: glibc X-Git-Author: Florian Weimer X-Git-Refname: refs/heads/release/2.35/master X-Git-Oldrev: 756d583c9eca5aa494822963a5063cfa214d1e11 X-Git-Newrev: 1695c5e0f66d2714b1f4bf0e38b20ebebbc6d1d2 Message-Id: <20220517095754.427273857025@sourceware.org> Date: Tue, 17 May 2022 09:57:54 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 May 2022 09:57:54 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=1695c5e0f66d2714b1f4bf0e38b20ebebbc6d1d2 commit 1695c5e0f66d2714b1f4bf0e38b20ebebbc6d1d2 Author: Florian Weimer Date: Thu Feb 3 10:58:59 2022 +0100 Linux: Remove HAVE_AUX_SECURE, HAVE_AUX_XID, HAVE_AUX_PAGESIZE They are always defined. Reviewed-by: Adhemerval Zanella (cherry picked from commit b9c3d3382f6f50e9723002deb2dc8127de720fa6) Diff: --- sysdeps/unix/sysv/linux/dl-sysdep.c | 55 +------------------------------------ sysdeps/unix/sysv/linux/ldsodefs.h | 12 -------- 2 files changed, 1 insertion(+), 66 deletions(-) diff --git a/sysdeps/unix/sysv/linux/dl-sysdep.c b/sysdeps/unix/sysv/linux/dl-sysdep.c index 4f60cecf98..72aa109f2f 100644 --- a/sysdeps/unix/sysv/linux/dl-sysdep.c +++ b/sysdeps/unix/sysv/linux/dl-sysdep.c @@ -85,21 +85,6 @@ _dl_sysdep_start (void **start_argptr, ElfW(Word) phnum = 0; ElfW(Addr) user_entry; ElfW(auxv_t) *av; -#ifdef HAVE_AUX_SECURE -# define set_seen(tag) (tag) /* Evaluate for the side effects. */ -# define set_seen_secure() ((void) 0) -#else - uid_t uid = 0; - gid_t gid = 0; - unsigned int seen = 0; -# define set_seen_secure() (seen = -1) -# ifdef HAVE_AUX_XID -# define set_seen(tag) (tag) /* Evaluate for the side effects. */ -# else -# define M(type) (1 << (type)) -# define set_seen(tag) seen |= M ((tag)->a_type) -# endif -#endif #ifdef NEED_DL_SYSINFO uintptr_t new_sysinfo = 0; #endif @@ -116,7 +101,7 @@ _dl_sysdep_start (void **start_argptr, "CONSTANT_MINSIGSTKSZ is constant"); GLRO(dl_minsigstacksize) = CONSTANT_MINSIGSTKSZ; - for (av = GLRO(dl_auxv); av->a_type != AT_NULL; set_seen (av++)) + for (av = GLRO(dl_auxv); av->a_type != AT_NULL; av++) switch (av->a_type) { case AT_PHDR: @@ -131,20 +116,7 @@ _dl_sysdep_start (void **start_argptr, case AT_ENTRY: user_entry = av->a_un.a_val; break; -#ifndef HAVE_AUX_SECURE - case AT_UID: - case AT_EUID: - uid ^= av->a_un.a_val; - break; - case AT_GID: - case AT_EGID: - gid ^= av->a_un.a_val; - break; -#endif case AT_SECURE: -#ifndef HAVE_AUX_SECURE - seen = -1; -#endif __libc_enable_secure = av->a_un.a_val; break; case AT_PLATFORM: @@ -183,31 +155,6 @@ _dl_sysdep_start (void **start_argptr, dl_hwcap_check (); -#ifndef HAVE_AUX_SECURE - if (seen != -1) - { - /* Fill in the values we have not gotten from the kernel through the - auxiliary vector. */ -# ifndef HAVE_AUX_XID -# define SEE(UID, var, uid) \ - if ((seen & M (AT_##UID)) == 0) var ^= __get##uid () - SEE (UID, uid, uid); - SEE (EUID, uid, euid); - SEE (GID, gid, gid); - SEE (EGID, gid, egid); -# endif - - /* If one of the two pairs of IDs does not match this is a setuid - or setgid run. */ - __libc_enable_secure = uid | gid; - } -#endif - -#ifndef HAVE_AUX_PAGESIZE - if (GLRO(dl_pagesize) == 0) - GLRO(dl_pagesize) = __getpagesize (); -#endif - #ifdef NEED_DL_SYSINFO if (new_sysinfo != 0) { diff --git a/sysdeps/unix/sysv/linux/ldsodefs.h b/sysdeps/unix/sysv/linux/ldsodefs.h index 011756ddc1..af108991f0 100644 --- a/sysdeps/unix/sysv/linux/ldsodefs.h +++ b/sysdeps/unix/sysv/linux/ldsodefs.h @@ -24,16 +24,4 @@ /* Get the real definitions. */ #include_next -/* We can assume that the kernel always provides the AT_UID, AT_EUID, - AT_GID, and AT_EGID values in the auxiliary vector from 2.4.0 or so on. */ -#define HAVE_AUX_XID - -/* We can assume that the kernel always provides the AT_SECURE value - in the auxiliary vector from 2.5.74 or so on. */ -#define HAVE_AUX_SECURE - -/* Starting with one of the 2.4.0 pre-releases the Linux kernel passes - up the page size information. */ -#define HAVE_AUX_PAGESIZE - #endif /* ldsodefs.h */