From: "tip-bot2 for Kees Cook" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: "Hector Marco-Gisbert" <hecmargi@upv.es>,
Kees Cook <keescook@chromium.org>, Borislav Petkov <bp@suse.de>,
Jason Gunthorpe <jgg@mellanox.com>,
Catalin Marinas <catalin.marinas@arm.com>, x86 <x86@kernel.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: [tip: core/core] arm64/elf: Disable automatic READ_IMPLIES_EXEC for 64-bit address spaces
Date: Mon, 20 Apr 2020 20:03:02 -0000 [thread overview]
Message-ID: <158741298213.28353.4215804588736774881.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20200327064820.12602-7-keescook@chromium.org>
The following commit has been merged into the core/core branch of tip:
Commit-ID: 6e0d6ac5f3d9d90271899f6d340872360fe1caee
Gitweb: https://git.kernel.org/tip/6e0d6ac5f3d9d90271899f6d340872360fe1caee
Author: Kees Cook <keescook@chromium.org>
AuthorDate: Thu, 26 Mar 2020 23:48:20 -07:00
Committer: Borislav Petkov <bp@suse.de>
CommitterDate: Mon, 20 Apr 2020 19:44:27 +02:00
arm64/elf: Disable automatic READ_IMPLIES_EXEC for 64-bit address spaces
With arm64 64-bit environments, there should never be a need for automatic
READ_IMPLIES_EXEC, as the architecture has always been execute-bit aware
(as in, the default memory protection should be NX unless a region
explicitly requests to be executable).
Suggested-by: Hector Marco-Gisbert <hecmargi@upv.es>
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Jason Gunthorpe <jgg@mellanox.com>
Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Link: https://lkml.kernel.org/r/20200327064820.12602-7-keescook@chromium.org
---
arch/arm64/include/asm/elf.h | 4 ++--
fs/compat_binfmt_elf.c | 5 +++++
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h
index 0074e9f..0e7df6f 100644
--- a/arch/arm64/include/asm/elf.h
+++ b/arch/arm64/include/asm/elf.h
@@ -105,7 +105,7 @@
* CPU*: | arm32 | arm64 |
* ELF: | | |
* ---------------------|------------|------------|
- * missing PT_GNU_STACK | exec-all | exec-all |
+ * missing PT_GNU_STACK | exec-all | exec-none |
* PT_GNU_STACK == RWX | exec-stack | exec-stack |
* PT_GNU_STACK == RW | exec-none | exec-none |
*
@@ -117,7 +117,7 @@
* *all arm64 CPUs support NX, so there is no "lacks NX" column.
*
*/
-#define elf_read_implies_exec(ex, stk) (stk == EXSTACK_DEFAULT)
+#define compat_elf_read_implies_exec(ex, stk) (stk == EXSTACK_DEFAULT)
#define CORE_DUMP_USE_REGSET
#define ELF_EXEC_PAGESIZE PAGE_SIZE
diff --git a/fs/compat_binfmt_elf.c b/fs/compat_binfmt_elf.c
index aaad4ca..3068d57 100644
--- a/fs/compat_binfmt_elf.c
+++ b/fs/compat_binfmt_elf.c
@@ -113,6 +113,11 @@
#define arch_setup_additional_pages compat_arch_setup_additional_pages
#endif
+#ifdef compat_elf_read_implies_exec
+#undef elf_read_implies_exec
+#define elf_read_implies_exec compat_elf_read_implies_exec
+#endif
+
/*
* Rename a few of the symbols that binfmt_elf.c will define.
* These are all local so the names don't really matter, but it
prev parent reply other threads:[~2020-04-20 20:03 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-27 6:48 [PATCH v5 0/6] binfmt_elf: Update READ_IMPLIES_EXEC logic for modern CPUs Kees Cook
2020-03-27 6:48 ` [PATCH v5 1/6] x86/elf: Add table to document READ_IMPLIES_EXEC Kees Cook
2020-04-20 20:03 ` [tip: core/core] " tip-bot2 for Kees Cook
2020-03-27 6:48 ` [PATCH v5 2/6] x86/elf: Split READ_IMPLIES_EXEC from executable PT_GNU_STACK Kees Cook
2020-04-20 20:03 ` [tip: core/core] " tip-bot2 for Kees Cook
2020-03-27 6:48 ` [PATCH v5 3/6] x86/elf: Disable automatic READ_IMPLIES_EXEC for 64-bit address spaces Kees Cook
2020-04-20 20:03 ` [tip: core/core] x86/elf: Disable automatic READ_IMPLIES_EXEC on 64-bit tip-bot2 for Kees Cook
2020-03-27 6:48 ` [PATCH v5 4/6] arm32/64, elf: Add tables to document READ_IMPLIES_EXEC Kees Cook
2020-04-20 20:03 ` [tip: core/core] arm32/64/elf: " tip-bot2 for Kees Cook
2020-03-27 6:48 ` [PATCH v5 5/6] arm32/64, elf: Split READ_IMPLIES_EXEC from executable PT_GNU_STACK Kees Cook
2020-04-20 20:03 ` [tip: core/core] arm32/64/elf: " tip-bot2 for Kees Cook
2020-03-27 6:48 ` [PATCH v5 6/6] arm64, elf: Disable automatic READ_IMPLIES_EXEC for 64-bit address spaces Kees Cook
2020-04-20 20:03 ` tip-bot2 for Kees Cook [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=158741298213.28353.4215804588736774881.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=bp@suse.de \
--cc=catalin.marinas@arm.com \
--cc=hecmargi@upv.es \
--cc=jgg@mellanox.com \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®