From patchwork Fri Dec 10 21:55:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 48807 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 C78F93857C4F for ; Fri, 10 Dec 2021 21:56:16 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C78F93857C4F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1639173376; bh=8EVOs9/WXEUDHUmaOafxwAFkxMArp3RIe151qBDtECg=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=nYpCUBOF0H5HRU+Zel6uhIsWU1HZKkL6HLjU85mAT1pC8tZdnHhCQyiz/IJmpS6x7 WCqosGnqVcpPlUJ7DChFR9UkakqVaYrFzrWj75G2gYJiNYYAChBQrwuNsYcO+cb0Y4 LNeSNsFOFluL963xlCPHAEaqTZRZFLWme1ccNOi8= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pg1-x532.google.com (mail-pg1-x532.google.com [IPv6:2607:f8b0:4864:20::532]) by sourceware.org (Postfix) with ESMTPS id C57003857809 for ; Fri, 10 Dec 2021 21:55:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C57003857809 Received: by mail-pg1-x532.google.com with SMTP id m15so9132407pgu.11 for ; Fri, 10 Dec 2021 13:55:53 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=8EVOs9/WXEUDHUmaOafxwAFkxMArp3RIe151qBDtECg=; b=aoOPpDYgfJkaaVLt/mOMsPMRRsHMJTicYuekdQpWnsi5POW7Nv1bzwnv1w/DDPJwvp 26PUc0QSikw0YpZr9HgUyG1ULPEV4TcwTUTWkLnASJhIVlbCdqOXDBaRcvpX5FH5YzFI JS+VI6kcFbTD12TXZDRH99gdIzdREpvRmd6A9mcaIGEmmmAI0E/RlVxGYx7ZTdi/Lj9W Q3bIQIN3HuLMJJ1TvCCeGZO5c/ThkJ72J2QY7/LriJXED0TIwqfCDlgGCX0HQLGw4F9X 2qqhJlalnAFXUZYmWp5WMsXS/hOLwKeqXdHNTGOhjOCcKupb+1CJ5RxXDTD9ywCpShNR V3Jw== X-Gm-Message-State: AOAM532wWQ2tJrcMXs4WlKv2QuWvjaTKBfwlbPIP7ikuHnEmWZX+H0iI RShk4IgPtPaxRCWybBZL03UUA23ymsY= X-Google-Smtp-Source: ABdhPJzGK+2xTwjdQLyO4lrDIBv3z6O8h/aGOtU/GahBtCvkzaUAb/59nmEzXjhkdDEEMpUH3yTDEg== X-Received: by 2002:a63:5751:: with SMTP id h17mr40910387pgm.614.1639173351973; Fri, 10 Dec 2021 13:55:51 -0800 (PST) Received: from gnu-cfl-2.localdomain ([172.58.35.133]) by smtp.gmail.com with ESMTPSA id o129sm4210657pfg.44.2021.12.10.13.55.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Dec 2021 13:55:51 -0800 (PST) Received: from gnu-cfl-2.. (localhost [IPv6:::1]) by gnu-cfl-2.localdomain (Postfix) with ESMTP id D56EE421470; Fri, 10 Dec 2021 13:55:50 -0800 (PST) To: libc-alpha@sourceware.org Subject: [PATCH] x86-64: Remove LD_PREFER_MAP_32BIT_EXEC support [BZ #28656] Date: Fri, 10 Dec 2021 13:55:50 -0800 Message-Id: <20211210215550.2546508-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.33.1 MIME-Version: 1.0 X-Spam-Status: No, score=-3029.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, KAM_SHORT, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP 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: "H.J. Lu via Libc-alpha" From: "H.J. Lu" Reply-To: "H.J. Lu" Cc: Florian Weimer Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Remove the LD_PREFER_MAP_32BIT_EXEC environment variable support since the first PT_LOAD segment is no longer executable due to defaulting to -z separate-code. This fixes [BZ #28656]. Reviewed-by: Florian Weimer --- NEWS | 4 ++ .../unix/sysv/linux/x86_64/64/dl-librecon.h | 45 ------------------- .../unix/sysv/linux/x86_64/64/mmap_internal.h | 42 ----------------- sysdeps/x86/cpu-tunables.c | 7 --- ...cpu-features-preferred_feature_index_1.def | 1 - 5 files changed, 4 insertions(+), 95 deletions(-) delete mode 100644 sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h delete mode 100644 sysdeps/unix/sysv/linux/x86_64/64/mmap_internal.h diff --git a/NEWS b/NEWS index 3a04befe8e..bf2b6846fc 100644 --- a/NEWS +++ b/NEWS @@ -9,6 +9,10 @@ Version 2.35 Major new features: +* The LD_PREFER_MAP_32BIT_EXEC environment variable support has been + removed since the first PT_LOAD segment is no longer executable due + to defaulting to -z separate-code. + * Unicode 14.0.0 Support: Character encoding, character type info, and transliteration tables are all updated to Unicode 14.0.0, using generator scripts contributed by Mike FABIAN (Red Hat). diff --git a/sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h b/sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h deleted file mode 100644 index 5b9696e2de..0000000000 --- a/sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h +++ /dev/null @@ -1,45 +0,0 @@ -/* Optional code to distinguish library flavours. x86-64 version. - Copyright (C) 2015-2021 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -#ifndef _DL_LIBRECON_H - -#include - -/* Recognizing extra environment variables. For 64-bit applications, - branch prediction performance may be negatively impacted when the - target of a branch is more than 4GB away from the branch. Add the - Prefer_MAP_32BIT_EXEC bit so that mmap will try to map executable - pages with MAP_32BIT first. NB: MAP_32BIT will map to lower 2GB, - not lower 4GB, address. Prefer_MAP_32BIT_EXEC reduces bits available - for address space layout randomization (ASLR). Prefer_MAP_32BIT_EXEC - is always disabled for SUID programs and can be enabled by setting - environment variable, LD_PREFER_MAP_32BIT_EXEC. */ -#define EXTRA_LD_ENVVARS \ - case 21: \ - if (!__libc_enable_secure \ - && memcmp (envline, "PREFER_MAP_32BIT_EXEC", 21) == 0) \ - GLRO(dl_x86_cpu_features).preferred[index_arch_Prefer_MAP_32BIT_EXEC] \ - |= bit_arch_Prefer_MAP_32BIT_EXEC; \ - break; - -/* Extra unsecure variables. The names are all stuffed in a single - string which means they have to be terminated with a '\0' explicitly. */ -#define EXTRA_UNSECURE_ENVVARS \ - "LD_PREFER_MAP_32BIT_EXEC\0" - -#endif /* dl-librecon.h */ diff --git a/sysdeps/unix/sysv/linux/x86_64/64/mmap_internal.h b/sysdeps/unix/sysv/linux/x86_64/64/mmap_internal.h deleted file mode 100644 index 18177d2cb3..0000000000 --- a/sysdeps/unix/sysv/linux/x86_64/64/mmap_internal.h +++ /dev/null @@ -1,42 +0,0 @@ -/* Linux mmap system call. x86-64 version. - Copyright (C) 2015-2021 Free Software Foundation, Inc. - - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -#ifndef MMAP_X86_64_INTERNAL_H -#define MMAP_X86_64_INTERNAL_H - -#include - -/* If the Prefer_MAP_32BIT_EXEC bit is set, try to map executable pages - with MAP_32BIT first. */ -#define MMAP_PREPARE(addr, len, prot, flags, fd, offset) \ - if ((addr) == NULL \ - && ((prot) & PROT_EXEC) != 0 \ - && HAS_ARCH_FEATURE (Prefer_MAP_32BIT_EXEC)) \ - { \ - void *ret = (void*) INLINE_SYSCALL_CALL (mmap, (addr), (len), \ - (prot), \ - (flags) | MAP_32BIT, \ - (fd), (offset)); \ - if (ret != MAP_FAILED) \ - return ret; \ - } - -#include_next - -#endif diff --git a/sysdeps/x86/cpu-tunables.c b/sysdeps/x86/cpu-tunables.c index 61b05e5b1d..957db3ad22 100644 --- a/sysdeps/x86/cpu-tunables.c +++ b/sysdeps/x86/cpu-tunables.c @@ -258,13 +258,6 @@ TUNABLE_CALLBACK (set_hwcaps) (tunable_val_t *valp) 20); } break; - case 21: - { - CHECK_GLIBC_IFUNC_PREFERRED_BOTH (n, cpu_features, - Prefer_MAP_32BIT_EXEC, - disable, 21); - } - break; case 23: { CHECK_GLIBC_IFUNC_PREFERRED_NEED_BOTH diff --git a/sysdeps/x86/include/cpu-features-preferred_feature_index_1.def b/sysdeps/x86/include/cpu-features-preferred_feature_index_1.def index 1530d594b3..8250bfcbec 100644 --- a/sysdeps/x86/include/cpu-features-preferred_feature_index_1.def +++ b/sysdeps/x86/include/cpu-features-preferred_feature_index_1.def @@ -26,7 +26,6 @@ BIT (I586) BIT (I686) BIT (Slow_SSE4_2) BIT (AVX_Fast_Unaligned_Load) -BIT (Prefer_MAP_32BIT_EXEC) BIT (Prefer_No_VZEROUPPER) BIT (Prefer_ERMS) BIT (Prefer_No_AVX512)