From patchwork Sun Apr 17 22:52:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fangrui Song X-Patchwork-Id: 52999 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 673E1385842E for ; Sun, 17 Apr 2022 22:53:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 673E1385842E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1650235988; bh=DQccxAp/68AqXBlPWpgv/0EcXGsMARIj/hZLtV6g0a4=; h=Date:Subject:To:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=jzHsHu2TXHvvFbaV29ROFE34Us/KRyiW7GhyvxmDJE1EyfJjS1U4VH1mZkjgq/UqI d7oFTj1Dun+LHlTfigSyXjWQUqoavxyJoluV+S9QvxhL0jKNhaJd71aLMn0D7idJAx yB35q5uVTVnsOm3ykqdjDulbjV2iTVzB635OJTJE= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by sourceware.org (Postfix) with ESMTPS id 73E753858D1E for ; Sun, 17 Apr 2022 22:52:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 73E753858D1E Received: by mail-yb1-xb4a.google.com with SMTP id a16-20020a056902057000b00641c83f82f5so10745725ybt.22 for ; Sun, 17 Apr 2022 15:52:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=DQccxAp/68AqXBlPWpgv/0EcXGsMARIj/hZLtV6g0a4=; b=aOu7lo35i0DXaoxnfNt4yr6+M8zMb1BX286MmBIJ1JFrjNsFcDG/disQslBIO3LEKo 0nbbLQVBekmtvwblFcnMrGbflvTovXPOrIz6GRfnhNszjhols2XAQklL80E2lXEbHSau 5dQ7MTua3XSYxkpjPaoEb6olcUma3LPUigaUdYbbBqS+H9C+11wrp3oQ6Y/bQICIK0GR 2CHQ3UYRCvNe+IDDxFsDMh+ODY302jKJAfo6T/ksmnTcW7b8Gl1F+EW4C2DCBS/VefbH OBgZlyFmGw+oROq/x3Dfs4mdznidJVohrvTKNeafZkpAjxFuC2SSdpzXrnhN7WCvgmoc lpPw== X-Gm-Message-State: AOAM533rBszI9WJi3gC5eZsV93cTYs7rC+wO+h8loNN2Ffg/yWCIGmM1 r07Q4s+8n0B+T8x6PscgwJYciESHQ3ZaUMdpLzz7vABc5dTlX8hraPq0wOd8O1sj4ZFQzzfmNLg tt2pXjUvJ2iHIl7CM++6+HwEawUG6+Jn4ZTvVsMpMsWKilhA6eEuDXsqW0XAiuBreduiZ X-Google-Smtp-Source: ABdhPJxhb3zp25DkLe56uzmYdVL5gklUBgJFztyekMC807x6cZCWcjix3/GywpRcNi8+a5TfyTtDGBQ1bifX X-Received: from maskray1.svl.corp.google.com ([2620:15c:2ce:200:5dd7:766d:215:6e64]) (user=maskray job=sendgmr) by 2002:a81:84c9:0:b0:2f1:7e12:6e65 with SMTP id u192-20020a8184c9000000b002f17e126e65mr3190697ywf.92.1650235965808; Sun, 17 Apr 2022 15:52:45 -0700 (PDT) Date: Sun, 17 Apr 2022 15:52:40 -0700 Message-Id: <20220417225240.1656529-1-maskray@google.com> Mime-Version: 1.0 Subject: [PATCH] elf: Remove __libc_enable_secure_decided To: libc-alpha@sourceware.org, Florian Weimer X-Spam-Status: No, score=-19.6 required=5.0 tests=BAYES_00, DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE, USER_IN_DEF_DKIM_WL 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-Patchwork-Original-From: Fangrui Song via Libc-alpha From: Fangrui Song Reply-To: Fangrui Song Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" 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 #include -/* 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)