From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id B5AC8C02198 for ; Tue, 11 Feb 2025 01:32:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 49964280008; Mon, 10 Feb 2025 20:32:50 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 44A83280006; Mon, 10 Feb 2025 20:32:50 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2C280280008; Mon, 10 Feb 2025 20:32:50 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 0D420280006 for ; Mon, 10 Feb 2025 20:32:50 -0500 (EST) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id BD2E2B13DA for ; Tue, 11 Feb 2025 01:32:49 +0000 (UTC) X-FDA: 83105939658.15.2CC3A15 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf16.hostedemail.com (Postfix) with ESMTP id 03ABB18000D for ; Tue, 11 Feb 2025 01:32:47 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=T2OYidUT; spf=pass (imf16.hostedemail.com: domain of sashal@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=sashal@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1739237568; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=pBZobvKUqLny8BnLHpeb+zric8hZ0GItzRH9vx711lc=; b=bRrkB1+qRuv78UQZt06ZQQ8L9zj0/dASCbCM2GPORf4tm/uOnbU0WR7HqS51+GoChv5zps PQVpmIeLh2zvuWacxbC4rxtuCDNFQCuTPyj8JYSSN4O0HDB6MZTg2KoF+abd4DxXz/SOyZ 9FsyWn8jetMJGynmWP13ojaAg+fjS9M= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=T2OYidUT; spf=pass (imf16.hostedemail.com: domain of sashal@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=sashal@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739237568; a=rsa-sha256; cv=none; b=E2QmFEh6Jkb2OuidURVxnEy6DXnk5wPDH+e/8dz3UaBYwEqNfo7GeRWIHDrTra33CAhOjy qsrPrMFvW8hAmN+lJgjP+OllxgwKq905cikhRh6kJebuQ0lALvp3XDT+ctMdjlkE8fAl3r 3wl0I3afQJLWXYktsqyLLYSTrMCrlxA= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 9DA615C5FE1; Tue, 11 Feb 2025 01:32:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2A817C4CED1; Tue, 11 Feb 2025 01:32:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1739237566; bh=4FeYUV86SVK6fSi2L6wSPLJGlg2gxzYIzB41ZvNrLMs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=T2OYidUTZZc3YiUKkOq5sV2Sx8FBQe6nfYibml8bXIgVHb06sIPUvW1j5Qy0NUI6C kFUXWqj3hlEOcUP2cOb2MsRXuB3HSv13RZjJK6Ic7n2BCV6pRamD/iEz6O4/fW6dC8 V6vo6iD+zYJASpvEdVKQz7Qs0NhR+isZVenrq5RU8oqxT7KSSkJQBQMz3sK4IWk9bO fdGf99bb8ppXfBOFBu4HqnhflQKLwlf4hlKhceCBiiJmqY3KuPJoafJTU5rrl6k3xa CG+wrsC0UCHyfpSSwAe3ciF6nNQOLm+LxEdVCBUZt15Ki4obN5v6XNBqRGZ/y6E6mo R8JJPYWNpx6fQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: "Eric W. Biederman" , Richard Henderson , Arnd Bergmann , John Paul Adrian Glaubitz , Kees Cook , Sasha Levin , mattst88@gmail.com, paulmck@kernel.org, viro@zeniv.linux.org.uk, brauner@kernel.org, akpm@linux-foundation.org, rick.p.edgecombe@intel.com, broonie@kernel.org, linux-alpha@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH AUTOSEL 5.15 8/9] alpha/elf: Fix misc/setarch test of util-linux by removing 32bit support Date: Mon, 10 Feb 2025 20:32:29 -0500 Message-Id: <20250211013230.4098681-8-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250211013230.4098681-1-sashal@kernel.org> References: <20250211013230.4098681-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.15.178 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 03ABB18000D X-Stat-Signature: a16uobwcjpszoxb95j8me3mysgpj3j43 X-HE-Tag: 1739237567-3487 X-HE-Meta: U2FsdGVkX1/Wrk/EGpOrhGJ57de0BfxoivghOYSHJ66J/xrfbNUdAOJ/vXWc8l5qvFh6cVWMx+Ji1f5A95A1kWlzaVKqjmYlb0AASwcl0vVSaN8YVdzftMnpjmePpiCRhWrv1krT19YJqM8Zl+xIYESFUMsyM21EaZjzJE1ofw0O7bIy+pUHnkw9yFZkEhvJD2xi90eHEs3gGE2M78sDgF1ZjHfbG2YFN55kvKyGf53fLiRIyyREuS1vy2nkUO/qKE7f2E6hVsq6LDjYINvF383PQps9v8VZF3I3ILfnW3DmYwKoOovb4wRgp4Qrn8Sp93t7iHc4cYcefIIh12IE0oHF5CrOlG+eXi6zDbr00+HQBvQ766feVYhcob3Mjf59/mleOIvlVxNKETdKjgORFm/b2dvX5XMsFs/kREjXYnIrbyDsStXKlr/MSivKhUZ/fofqBHHR4VujAGAyFtnYeU8dN8ML0SlX0W10kkNOWp43dHLd0iwuK21nq+9lJrvJlHGzktGEaKgjK1QG5df7MRCIdDBgbgEm8HJczlUz6q9jxxMBvTxUESC02XRh6ew+Q+nl+w+/oNhv4rAcL4o96RtLWZbBgW5juxYDIbIwMRRR6Ig7YBL3QhdARX2kAHNi6T+mIQlQ7o3xghMNw4D8etyPrL80x4M44Z3j95bhgFtUnCsVz/9w1j4sxCVo5KXcXDLu4JjGfbw7xSihmesRs1dBEZ2/pQCwuad5hotGTGei1f1nWIe2Xw2d+2kQbK04ViR0dnTZgCfyyw1DfrgRmY+XJoeIwfk3xTyrT1IXlcP42BsIFIw7Bj0Qn71WzwoN0Cz4BQHHv4mRXRRPhdTuYdVMLaJH+ihUJaFZLcqygg1A5l6zbYHNcw0GFa7JGEtB5i0Smp1Z/Dj1qdv+rIjpz2N46vu/lQbxFYAM0nzV1HUjyi4lKqWY3tIRs3XnrYV4gjftftmBj0f9Mo0m+HE xXeAgFmk 7vGZ2zoS6ukPfEsJkYc2X4rOwDROK3TmCC3+964/OlZ4YDgNVYEu355JrTmr06ri3aN1z9zkdDGXlQoxbr1x7WbubROP9RywzmbLf+dfYJY8dID+JIyvKLkTUPLJJOcbDCEOK4YAXDKGuG9dZjI4KV7Kb5X4Pi5vktozRHUbt/jWnKAyrQIysJbNZQYiK1IPlKT0nfqMOlWBqS4By+MxH+q39R+OL0xZjU5dVFjwucI5s9Svgb4n/yA4ohZUmQEzm/nX7Fv4uK2Vh7TeE0sTgT4kKx5DhP/OAEaJA+aKZohlWwx1i1O1sT2YZFvGWQjYsxnUFvMAEaZgI86DsRxxgTjAbTi5HNONB71WioSWyob0Aktm/Vg+BRzvYZZPfI0xSMYPlnbUclH9JXiqIzla8nuVgIZVxeLqr6+hz56ZjYwSZdAN/k3epsXgzVg== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: "Eric W. Biederman" [ Upstream commit b029628be267cba3c7684ec684749fe3e4372398 ] Richard Henderson writes[1]: > There was a Spec benchmark (I forget which) which was memory bound and ran > twice as fast with 32-bit pointers. > > I copied the idea from DEC to the ELF abi, but never did all the other work > to allow the toolchain to take advantage. > > Amusingly, a later Spec changed the benchmark data sets to not fit into a > 32-bit address space, specifically because of this. > > I expect one could delete the ELF bit and personality and no one would > notice. Not even the 10 remaining Alpha users. In [2] it was pointed out that parts of setarch weren't working properly on alpha because it has it's own SET_PERSONALITY implementation. In the discussion that followed Richard Henderson pointed out that the 32bit pointer support for alpha was never completed. Fix this by removing alpha's 32bit pointer support. As a bit of paranoia refuse to execute any alpha binaries that have the EF_ALPHA_32BIT flag set. Just in case someone somewhere has binaries that try to use alpha's 32bit pointer support. Link: https://lkml.kernel.org/r/CAFXwXrkgu=4Qn-v1PjnOR4SG0oUb9LSa0g6QXpBq4ttm52pJOQ@mail.gmail.com [1] Link: https://lkml.kernel.org/r/20250103140148.370368-1-glaubitz@physik.fu-berlin.de [2] Signed-off-by: Eric W. Biederman Reviewed-by: Richard Henderson Reviewed-by: Arnd Bergmann Reviewed-by: John Paul Adrian Glaubitz Tested-by: John Paul Adrian Glaubitz Link: https://lore.kernel.org/r/87y0zfs26i.fsf_-_@email.froward.int.ebiederm.org Signed-off-by: Kees Cook Signed-off-by: Sasha Levin --- arch/alpha/include/asm/elf.h | 6 +----- arch/alpha/include/asm/pgtable.h | 2 +- arch/alpha/include/asm/processor.h | 8 ++------ arch/alpha/kernel/osf_sys.c | 11 ++--------- 4 files changed, 6 insertions(+), 21 deletions(-) diff --git a/arch/alpha/include/asm/elf.h b/arch/alpha/include/asm/elf.h index 8049997fa372a..2039a8c8d5473 100644 --- a/arch/alpha/include/asm/elf.h +++ b/arch/alpha/include/asm/elf.h @@ -74,7 +74,7 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG]; /* * This is used to ensure we don't load something for the wrong architecture. */ -#define elf_check_arch(x) ((x)->e_machine == EM_ALPHA) +#define elf_check_arch(x) (((x)->e_machine == EM_ALPHA) && !((x)->e_flags & EF_ALPHA_32BIT)) /* * These are used to set parameters in the core dumps. @@ -145,10 +145,6 @@ extern int dump_elf_task_fp(elf_fpreg_t *dest, struct task_struct *task); : amask (AMASK_CIX) ? "ev6" : "ev67"); \ }) -#define SET_PERSONALITY(EX) \ - set_personality(((EX).e_flags & EF_ALPHA_32BIT) \ - ? PER_LINUX_32BIT : PER_LINUX) - extern int alpha_l1i_cacheshape; extern int alpha_l1d_cacheshape; extern int alpha_l2_cacheshape; diff --git a/arch/alpha/include/asm/pgtable.h b/arch/alpha/include/asm/pgtable.h index 02f0429f1068a..8e3cf3c9f913d 100644 --- a/arch/alpha/include/asm/pgtable.h +++ b/arch/alpha/include/asm/pgtable.h @@ -340,7 +340,7 @@ extern inline pte_t mk_swap_pte(unsigned long type, unsigned long offset) extern void paging_init(void); -/* We have our own get_unmapped_area to cope with ADDR_LIMIT_32BIT. */ +/* We have our own get_unmapped_area */ #define HAVE_ARCH_UNMAPPED_AREA #endif /* _ALPHA_PGTABLE_H */ diff --git a/arch/alpha/include/asm/processor.h b/arch/alpha/include/asm/processor.h index 6100431da07a3..d27db62c3247d 100644 --- a/arch/alpha/include/asm/processor.h +++ b/arch/alpha/include/asm/processor.h @@ -8,23 +8,19 @@ #ifndef __ASM_ALPHA_PROCESSOR_H #define __ASM_ALPHA_PROCESSOR_H -#include /* for ADDR_LIMIT_32BIT */ - /* * We have a 42-bit user address space: 4TB user VM... */ #define TASK_SIZE (0x40000000000UL) -#define STACK_TOP \ - (current->personality & ADDR_LIMIT_32BIT ? 0x80000000 : 0x00120000000UL) +#define STACK_TOP (0x00120000000UL) #define STACK_TOP_MAX 0x00120000000UL /* This decides where the kernel will search for a free chunk of vm * space during mmap's. */ -#define TASK_UNMAPPED_BASE \ - ((current->personality & ADDR_LIMIT_32BIT) ? 0x40000000 : TASK_SIZE / 2) +#define TASK_UNMAPPED_BASE (TASK_SIZE / 2) typedef struct { unsigned long seg; diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c index 8bbeebb73cf03..2dfb69a2ae43a 100644 --- a/arch/alpha/kernel/osf_sys.c +++ b/arch/alpha/kernel/osf_sys.c @@ -1212,8 +1212,7 @@ SYSCALL_DEFINE1(old_adjtimex, struct timex32 __user *, txc_p) return ret; } -/* Get an address range which is currently unmapped. Similar to the - generic version except that we know how to honor ADDR_LIMIT_32BIT. */ +/* Get an address range which is currently unmapped. */ static unsigned long arch_get_unmapped_area_1(unsigned long addr, unsigned long len, @@ -1235,13 +1234,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr, unsigned long len, unsigned long pgoff, unsigned long flags) { - unsigned long limit; - - /* "32 bit" actually means 31 bit, since pointers sign extend. */ - if (current->personality & ADDR_LIMIT_32BIT) - limit = 0x80000000; - else - limit = TASK_SIZE; + unsigned long limit = TASK_SIZE; if (len > limit) return -ENOMEM; -- 2.39.5