From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oi1-x22c.google.com (mail-oi1-x22c.google.com [IPv6:2607:f8b0:4864:20::22c]) by sourceware.org (Postfix) with ESMTPS id 2DA313858D1E for ; Tue, 8 Feb 2022 20:11:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 2DA313858D1E Received: by mail-oi1-x22c.google.com with SMTP id ay7so234259oib.8 for ; Tue, 08 Feb 2022 12:11:28 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:references:from:in-reply-to :content-transfer-encoding; bh=cmdP02Nzh4CSRrcukEI02uGIbKELHjhnCuS1K6LZ1qE=; b=hh8b3sNU3YQ/uC7AzrRfRIouHfbbXQzWOGnLEafiCl+Z5ii0nPRytL9M5lmXs5JhFZ Fnw8Ef5XIthAbB5kZHxNpiovm583iPIJT3Buf8TgK9D6/2FjFVKsTicYdbAKUtz67LcE sJWUCW0xPKKhnEtj/fNJq2kv9lG6xwFRiF1QWCubFCSM1jfieU0vyiwAcz+YdZKCSLGr fGDvGPI4GbDVkw4HGU0cxuoZEvEmntj8P5YYZuINzsoY/+W2pF1ZBkJAPZJIXP520SE4 nGDQxQidwkZUL0VKnNDC4MBh2ZauNdJjClrtOzLrE87SFTiXY8dc04frezolz3P2CjPb PJrA== X-Gm-Message-State: AOAM532WeYSGCbQoCaQW0mXgmkJYNGI6bJH2wtFGaFQBqiR4viR4kPsb ZmGaBaz1gPxxIYr/bGbbAeITUQ== X-Google-Smtp-Source: ABdhPJwLmsaSfoTFrFTyR90FV9O/+VYWEl2oCXq4n+iMXXGo8j6aqf71LgbUBbKTGwgh2Flkcd31yg== X-Received: by 2002:a05:6808:1452:: with SMTP id x18mr1330356oiv.207.1644351087234; Tue, 08 Feb 2022 12:11:27 -0800 (PST) Received: from ?IPV6:2804:431:c7ca:733:86a9:ad5:adef:2f3e? ([2804:431:c7ca:733:86a9:ad5:adef:2f3e]) by smtp.gmail.com with ESMTPSA id p5sm5731326oou.39.2022.02.08.12.11.26 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 08 Feb 2022 12:11:27 -0800 (PST) Message-ID: Date: Tue, 8 Feb 2022 17:11:25 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.6.0 Subject: Re: [PATCH v2 2/5] Linux: Remove HAVE_AUX_SECURE, HAVE_AUX_XID, HAVE_AUX_PAGESIZE Content-Language: en-US To: Florian Weimer , libc-alpha@sourceware.org References: <3015150c0841a1037690ebfebd4d455b399239d0.1643886336.git.fweimer@redhat.com> From: Adhemerval Zanella In-Reply-To: <3015150c0841a1037690ebfebd4d455b399239d0.1643886336.git.fweimer@redhat.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-12.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, NICE_REPLY_A, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Feb 2022 20:11:30 -0000 On 03/02/2022 08:08, Florian Weimer via Libc-alpha wrote: > They are always defined. LGTM, thanks. Reviewed-by: Adhemerval Zanella > --- > 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 */