From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 3C52047A62; Mon, 1 Apr 2024 16:29:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711988958; cv=none; b=loakEQfCKeGkDamrngWoniLJlBzsYZazt6X0z1L9wtVmWUbvNaIZ191p2twqPgqQ2ATX2apf4RHmsOMkNLb1bA8qYKMISVRP0SiR7NRzNGdvBW0WOwwICiViU5IwJU1wDpluvCjQlwMdaaFm2KV4Egq9EVB97TPuGJD3O391RyM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711988958; c=relaxed/simple; bh=UGtwlrdnTpmXV3tMBBHVED+gCiTGXLCCTrojZVcXI1o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=f9ngMDpoKmzs7NsY5PuAWNFVVE2+MuGnPL3OloX2SQP0ju1KOCQazH39RDCcqZOm2P+XL8OiKqRATb0LU8v8EgV+eipDD2ZxmNYwlxs6P4ansUVBYXIYXYaV2uKLcc4D5mBorjl1jjjvLXVFpRaJJOTVujBe8H1qj1DvPotPkrk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=B2N+1eEu; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="B2N+1eEu" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 89192C433C7; Mon, 1 Apr 2024 16:29:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1711988958; bh=UGtwlrdnTpmXV3tMBBHVED+gCiTGXLCCTrojZVcXI1o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=B2N+1eEu2ZrqmYsaOqXApX4VGszE+s+Zt6ehO0cjYHL2p0uEQh2Z7k6OiGttLWwwR qT4/cyzSU9wL56qtevXutLacq+nL5FR6rCezxO4sPLGo6s6hN+UFikhtq8UBxWRMG8 LuD1VySKX1B0RjgVpVE+Gg1g0zMXRNjPBWgjD6a4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Zev Weiss , Borislav Petkov , David Hildenbrand , Florent Revest , Helge Deller , "James E.J. Bottomley" , Josh Triplett , Kees Cook , Miguel Ojeda , "Mike Rapoport (IBM)" , Oleg Nesterov , Ondrej Mosnacek , Rick Edgecombe , "Russell King (Oracle)" , Sam James , Stefan Roesch , Yang Shi , Yin Fengwei , Andrew Morton Subject: [PATCH 6.7 339/432] ARM: prctl: reject PR_SET_MDWE on pre-ARMv6 Date: Mon, 1 Apr 2024 17:45:26 +0200 Message-ID: <20240401152603.337565069@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240401152553.125349965@linuxfoundation.org> References: <20240401152553.125349965@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.7-stable review patch. If anyone has any objections, please let me know. ------------------ From: Zev Weiss commit 166ce846dc5974a266f6c2a2896dbef5425a6f21 upstream. 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). Link: https://lkml.kernel.org/r/20240227013546.15769-6-zev@bewilderbeest.net Signed-off-by: Zev Weiss Cc: [6.3+] Cc: Borislav Petkov Cc: David Hildenbrand Cc: Florent Revest Cc: Helge Deller Cc: "James E.J. Bottomley" Cc: Josh Triplett Cc: Kees Cook Cc: Miguel Ojeda Cc: Mike Rapoport (IBM) Cc: Oleg Nesterov Cc: Ondrej Mosnacek Cc: Rick Edgecombe Cc: Russell King (Oracle) Cc: Sam James Cc: Stefan Roesch Cc: Yang Shi Cc: Yin Fengwei Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman --- arch/arm/include/asm/mman.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 arch/arm/include/asm/mman.h --- /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__ */