From patchwork Tue Feb 27 01:35:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zev Weiss X-Patchwork-Id: 206995 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp2435555dyb; Mon, 26 Feb 2024 17:36:32 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCXBecWzjoOauFUNaynzx2RKSwmwkd2mDM8FPgY445PnQgZjUe8JEz1W7XlWXIG9urIP7av34yf3yAGCkTkJlE670iSiIA== X-Google-Smtp-Source: AGHT+IEydQQrLThngYEd8oHdpTA7vEGNasULbHjj1mtOzhFDRnxTYjOtjehFiDO6EJ3Uyd6FE9rN X-Received: by 2002:a05:6808:6492:b0:3c1:86bf:f9ac with SMTP id fh18-20020a056808649200b003c186bff9acmr701502oib.17.1708997791925; Mon, 26 Feb 2024 17:36:31 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708997791; cv=pass; d=google.com; s=arc-20160816; b=IhhlJM/QBIb0ZPVgUHuL3H6rR/kWZGvbCql9ECoZRGuuENnK64Lm93UKQ5nSekIO6d RHtn7Wt8KuyX/7jtoOT5e6tmzvUz/OT0gRtU0yx6ANYwHvwjF2LmRjkTWkhthCXIoqXl otwWvt8+GuRb7qIjamfJuqTvucH7CkmXN4hAXF/tz20WMBZXkXqE4qiOoMupaExSpTCu kXG0CccKCYoUGO6PyV7Kma3WMGyJ10MZzA/GNzuP1MzFJwyBn0osj7K7Fgnes2T6Azmo S+3MPgt2RmOY1qh4Y7HvPOCeCirSvk7LN05txiCeX4snd22XePhMcq6aeIW1IOeNfyde hHLw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=djflHMn74Aoza7I3oyPhQDEGULANvQSmtPsfFrwIYIA=; fh=Q7vCzlRPJqbijdGCMcfQJMqFdj4BSllMtbPRSmFCmYI=; b=my+Jw+5VAWk6/D82Vbbr1y03DCGkCu3fq5b/YNiK+3wf004Fz2W0ZBbxi594bV7HtL /YVgk2sNlTK9TzdPn3wXk12z7TgsS/OSi5y9aC3C35tz8QeREkqDbYYNhUCb0yBMiD45 sa/9kCr9WyNcU+TRESbS/T0fMpLCGg7UeEIid0fEL9TWhvhJchVeYos3WLFEykivYlwa E7hpp0Fe3c+jY4WsPgZb2qEQFifsr6q8dnXlMvlSUifB07mps503rbwYzfFim7+cuk9s j0aMGux/Speal95MRrukJEnhK8iZr5dzIeYMjGXPciiNljrABG0K2KY8IBWLSM3GZgVg TQ9Q==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@bewilderbeest.net header.s=thorn header.b=AxLlMvyX; arc=pass (i=1 spf=pass spfdomain=bewilderbeest.net dkim=pass dkdomain=bewilderbeest.net dmarc=pass fromdomain=bewilderbeest.net); spf=pass (google.com: domain of linux-kernel+bounces-82538-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-82538-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=bewilderbeest.net Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id r17-20020a056214125100b006901a3b7869si1474493qvv.297.2024.02.26.17.36.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Feb 2024 17:36:31 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-82538-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@bewilderbeest.net header.s=thorn header.b=AxLlMvyX; arc=pass (i=1 spf=pass spfdomain=bewilderbeest.net dkim=pass dkdomain=bewilderbeest.net dmarc=pass fromdomain=bewilderbeest.net); spf=pass (google.com: domain of linux-kernel+bounces-82538-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-82538-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=bewilderbeest.net Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id A40191C21675 for ; Tue, 27 Feb 2024 01:36:31 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 53DE31BC40; Tue, 27 Feb 2024 01:36:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=bewilderbeest.net header.i=@bewilderbeest.net header.b="AxLlMvyX" Received: from thorn.bewilderbeest.net (thorn.bewilderbeest.net [71.19.156.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1EADF53A7; Tue, 27 Feb 2024 01:35:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=71.19.156.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708997757; cv=none; b=BBd6brvpNXgobFymLQhG/dF4YcvgHaL2tpZP3ihWqJYzjYH3vgHiunkkChq9Sd2K1LKIk5SOCbRoc5UItKjR+1Ivxzglb+f5iDoIrGJxmVBVVnc0yjL1fl/6iy6iLTfavduDb2d4NohMI8BHiFPZaZBo9s80LpljsHm+GR5qWpA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708997757; c=relaxed/simple; bh=cskhCraRLUN/8AG+y2v+YigFt0ecsFqLjy2QTRPHqrE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dvEP0PRnTBtXYUFXuk2i4YYa+7hQclkO1v0HC9N90V4+K8JssQ1Q5Cgn77kTv9+8ZIiT89ghwFoS37+FWxklBTRyawh2tlSBPr/sp3H48XbVYthOnt9NtnKwtDXznUpGYrakUxSaANFvbbT/7hZdzPKhm7pPWO3PqSSAeo28jvc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=bewilderbeest.net; spf=pass smtp.mailfrom=bewilderbeest.net; dkim=pass (1024-bit key) header.d=bewilderbeest.net header.i=@bewilderbeest.net header.b=AxLlMvyX; arc=none smtp.client-ip=71.19.156.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=bewilderbeest.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bewilderbeest.net Received: from hatter.bewilderbeest.net (unknown [IPv6:2602:61:712b:6300::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: zev) by thorn.bewilderbeest.net (Postfix) with ESMTPSA id BAB8642BE; Mon, 26 Feb 2024 17:35:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bewilderbeest.net; s=thorn; t=1708997755; bh=djflHMn74Aoza7I3oyPhQDEGULANvQSmtPsfFrwIYIA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AxLlMvyXHvt14ldDBhIa4S0wWMk7ibuO9rV2OF7ak9xXdpCJTaFgDzP64nK/sv6Gm Fowrni/G+U1w2BihQcqwfrtfhR1BA4Cl1XVSXbu659qFAh+yQDK1nNCqPM1hssMDdE bWpi/y082Tr2j+A0xZ8/9iE6fD6FJJPTY1hpF18o= From: Zev Weiss To: Russell King , linux-parisc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Helge Deller , Florent Revest Cc: Zev Weiss , "James E.J. Bottomley" , "Borislav Petkov (AMD)" , Yin Fengwei , "Mike Rapoport (IBM)" , Andrew Morton , Kees Cook , Yang Shi , Rick Edgecombe , Oleg Nesterov , David Hildenbrand , Stefan Roesch , Josh Triplett , Ondrej Mosnacek , Miguel Ojeda , linux-kernel@vger.kernel.org, openbmc@lists.ozlabs.org, Sam James , stable@vger.kernel.org Subject: [PATCH RESEND 1/2] prctl: Generalize PR_SET_MDWE support check to be per-arch Date: Mon, 26 Feb 2024 17:35:41 -0800 Message-ID: <20240227013546.15769-5-zev@bewilderbeest.net> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240227013546.15769-4-zev@bewilderbeest.net> References: <20240227013546.15769-4-zev@bewilderbeest.net> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792014068966427933 X-GMAIL-MSGID: 1792014068966427933 There exist systems other than PARISC where MDWE may not be feasible to support; rather than cluttering up the generic code with additional arch-specific logic let's add a generic function for checking MDWE support and allow each arch to override it as needed. Signed-off-by: Zev Weiss Cc: # v6.3+ Acked-by: Helge Deller # parisc --- arch/parisc/include/asm/mman.h | 14 ++++++++++++++ include/linux/mman.h | 8 ++++++++ kernel/sys.c | 7 +++++-- 3 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 arch/parisc/include/asm/mman.h diff --git a/arch/parisc/include/asm/mman.h b/arch/parisc/include/asm/mman.h new file mode 100644 index 000000000000..47c5a1991d10 --- /dev/null +++ b/arch/parisc/include/asm/mman.h @@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __ASM_MMAN_H__ +#define __ASM_MMAN_H__ + +#include + +/* PARISC cannot allow mdwe as it needs writable stacks */ +static inline bool arch_memory_deny_write_exec_supported(void) +{ + return false; +} +#define arch_memory_deny_write_exec_supported arch_memory_deny_write_exec_supported + +#endif /* __ASM_MMAN_H__ */ diff --git a/include/linux/mman.h b/include/linux/mman.h index dc7048824be8..bcb201ab7a41 100644 --- a/include/linux/mman.h +++ b/include/linux/mman.h @@ -162,6 +162,14 @@ calc_vm_flag_bits(unsigned long flags) unsigned long vm_commit_limit(void); +#ifndef arch_memory_deny_write_exec_supported +static inline bool arch_memory_deny_write_exec_supported(void) +{ + return true; +} +#define arch_memory_deny_write_exec_supported arch_memory_deny_write_exec_supported +#endif + /* * Denies creating a writable executable mapping or gaining executable permissions. * diff --git a/kernel/sys.c b/kernel/sys.c index f8e543f1e38a..8bb106a56b3a 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -2408,8 +2408,11 @@ static inline int prctl_set_mdwe(unsigned long bits, unsigned long arg3, if (bits & PR_MDWE_NO_INHERIT && !(bits & PR_MDWE_REFUSE_EXEC_GAIN)) return -EINVAL; - /* PARISC cannot allow mdwe as it needs writable stacks */ - if (IS_ENABLED(CONFIG_PARISC)) + /* + * EOPNOTSUPP might be more appropriate here in principle, but + * existing userspace depends on EINVAL specifically. + */ + if (!arch_memory_deny_write_exec_supported()) return -EINVAL; current_bits = get_current_mdwe(); From patchwork Tue Feb 27 01:35:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zev Weiss X-Patchwork-Id: 206996 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp2435577dyb; Mon, 26 Feb 2024 17:36:35 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVojK+wNr0wI5PeMn0V5EV1nqmVGzIXusdAFy+7XZJ7d1MoAj6i/cED22PusCh/bTvaBSdeIcucXQZSXBpN8gMToMcKDg== X-Google-Smtp-Source: AGHT+IG+y3hh0y81XK1wuDwmfzg3PjCYuXGd4IueCa/KEm7EW0HvUA2kOsM1Bd1+2k1pnSS6Xop3 X-Received: by 2002:a67:e297:0:b0:470:a10e:4c15 with SMTP id g23-20020a67e297000000b00470a10e4c15mr5333649vsf.1.1708997794783; Mon, 26 Feb 2024 17:36:34 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708997794; cv=pass; d=google.com; s=arc-20160816; b=qe60H6Lets/UyxSrUMftI1sK4cxUSIMz4bFFvoKxTEWVSepWWJPcSw4n5V2DJmkkqA IyYTXCYO68GM/4mGKH+XxyP80b3XXzH2k0hx/ltjT3LKQ/lzuMCZXDYyMc3M5Fq8HxYE kZvkblH+XdaBs6QeHgoOxGq15oV9xtNXqcNg0bVGUxkEaiBRpuD0U2l990AYigTE55mg PlcPrRdXVipa+akPgOUMu4b+2+FdujJRgG5cvn5SAz95i4pU5BcRhY1KHOqun6kyNRRa JkrMxzPfpFb98gRa91Edk5SQcLYbMtlN1IqfNt4P0kGvDisw+g7sbDISZ1AI65RLuKlS Tqtw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=BpkbZoKcb/ElcmyFvuLHFS6Mz0ozyOSKWVwGl1poh1I=; fh=Q7vCzlRPJqbijdGCMcfQJMqFdj4BSllMtbPRSmFCmYI=; b=tT51KaN7Lb97Nf0LlO1dZo1b1klquSndA36JtKzW0Yeh3+DopAUcWUpMbVqVpYup69 XxDVYHG/pc5qbBQRtoXl0HPqIBV7eIXKxihvJ+bVOQs23JEVlaKvN54WJERi9hVDLHXs grWDHJEdjfGolIIoHscB0kPzj5PI8djvy8KuNBRC52QseLowtgn4oiyv7j54WQErtxTP DDNxr2h6B4Fa8ObBhD8k1ZTD9+5gxo6IWfDEiJHYhS5GNNIAHHbMJwjHb/qt8r1iGvX6 920kZNd7EabIlkHBkikX9ZBuVNfwNTAV8JzmeCwLDUqiWxSxUrbeUDUVle+XPuYWqfbU nTxA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@bewilderbeest.net header.s=thorn header.b=i8pi9UQD; arc=pass (i=1 spf=pass spfdomain=bewilderbeest.net dkim=pass dkdomain=bewilderbeest.net dmarc=pass fromdomain=bewilderbeest.net); spf=pass (google.com: domain of linux-kernel+bounces-82539-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-82539-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=bewilderbeest.net Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id a10-20020a05620a102a00b00783ab5f86adsi6298455qkk.265.2024.02.26.17.36.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Feb 2024 17:36:34 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-82539-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@bewilderbeest.net header.s=thorn header.b=i8pi9UQD; arc=pass (i=1 spf=pass spfdomain=bewilderbeest.net dkim=pass dkdomain=bewilderbeest.net dmarc=pass fromdomain=bewilderbeest.net); spf=pass (google.com: domain of linux-kernel+bounces-82539-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-82539-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=bewilderbeest.net Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 8EDBE1C21127 for ; Tue, 27 Feb 2024 01:36:34 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C690A1CD03; Tue, 27 Feb 2024 01:36:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=bewilderbeest.net header.i=@bewilderbeest.net header.b="i8pi9UQD" Received: from thorn.bewilderbeest.net (thorn.bewilderbeest.net [71.19.156.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AA2925695; Tue, 27 Feb 2024 01:35:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=71.19.156.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708997758; cv=none; b=vFDkcYPNklW9ccbNTSrXJe28VF6NUqtWbylXL36VsnisLHF1EW4jfkYrPmNlu+3g1PDbifNybmnnXkjEOIFnXBewmcR9Fz1EGPmQgo6fZE0F5eTtdMxaSxR44UMvywnilji9lsboFJb0V7/Y40toT6sli9801Bvk+lJS30b37Xk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708997758; c=relaxed/simple; bh=UfJ5aIrJuflIizXwpp3hAJQHhiJ7bqa/sOMnF4kfdBs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IDyNqTiKWqu+EVrZOaP7MIUCcRr7DYdoSSiHgxrwn/Lc0Q/0175HB70l7NjMeMEjxdzagbGXBa5O8uJqjW0LwCiTMmYNPYsii+SzWp5Oue1g+Bufbr0LN7jl6DH5Li4yOZ97WzYGb0RzS0+V8nO77MAlU96vXFo39HwNouzevXk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=bewilderbeest.net; spf=pass smtp.mailfrom=bewilderbeest.net; dkim=pass (1024-bit key) header.d=bewilderbeest.net header.i=@bewilderbeest.net header.b=i8pi9UQD; arc=none smtp.client-ip=71.19.156.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=bewilderbeest.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bewilderbeest.net Received: from hatter.bewilderbeest.net (unknown [IPv6:2602:61:712b:6300::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: zev) by thorn.bewilderbeest.net (Postfix) with ESMTPSA id 70FAB42C7; Mon, 26 Feb 2024 17:35:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bewilderbeest.net; s=thorn; t=1708997756; bh=BpkbZoKcb/ElcmyFvuLHFS6Mz0ozyOSKWVwGl1poh1I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=i8pi9UQDl+FTEkyoh7hOS5J5lRGjMIL8a3rV/L92/Ad3dZCdBxJOWKlDIP2Mxec0c LnnIgq4N20v+KoqvA71dCi7nzTaFMc4gZN0pNNwiND5AEDG/ShB0ouziEmHKwtYsxD cZIMb7RFbVGdMffzTaUtGY0JwePwtrzZORnDBQKc= From: Zev Weiss To: Russell King , linux-parisc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Helge Deller , Florent Revest Cc: Zev Weiss , "James E.J. Bottomley" , "Borislav Petkov (AMD)" , Yin Fengwei , "Mike Rapoport (IBM)" , Andrew Morton , Kees Cook , Yang Shi , Rick Edgecombe , Oleg Nesterov , David Hildenbrand , Stefan Roesch , Josh Triplett , Ondrej Mosnacek , Miguel Ojeda , linux-kernel@vger.kernel.org, openbmc@lists.ozlabs.org, Sam James , stable@vger.kernel.org Subject: [PATCH RESEND 2/2] ARM: prctl: Reject PR_SET_MDWE on pre-ARMv6 Date: Mon, 26 Feb 2024 17:35:42 -0800 Message-ID: <20240227013546.15769-6-zev@bewilderbeest.net> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240227013546.15769-4-zev@bewilderbeest.net> References: <20240227013546.15769-4-zev@bewilderbeest.net> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792014071566559484 X-GMAIL-MSGID: 1792014071566559484 On v5 and lower CPUs we can't provide MDWE protection, so ensure we fail any attempt to enable it via prctl(PR_SET_MDWE). Previously such an attempt would misleadingly succeed, leading to any subsequent mmap(PROT_READ|PROT_WRITE) or execve() failing unconditionally (the latter somewhat violently via force_fatal_sig(SIGSEGV) due to READ_IMPLIES_EXEC). Signed-off-by: Zev Weiss Cc: # v6.3+ --- arch/arm/include/asm/mman.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 arch/arm/include/asm/mman.h diff --git a/arch/arm/include/asm/mman.h b/arch/arm/include/asm/mman.h new file mode 100644 index 000000000000..2189e507c8e0 --- /dev/null +++ b/arch/arm/include/asm/mman.h @@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __ASM_MMAN_H__ +#define __ASM_MMAN_H__ + +#include +#include + +static inline bool arch_memory_deny_write_exec_supported(void) +{ + return cpu_architecture() >= CPU_ARCH_ARMv6; +} +#define arch_memory_deny_write_exec_supported arch_memory_deny_write_exec_supported + +#endif /* __ASM_MMAN_H__ */