[<prev] [next>] [day] [month] [year] [list]
Message-ID: <157294605469.29376.1927649765059969154.tip-bot2@tip-bot2>
Date: Tue, 05 Nov 2019 09:27:34 -0000
From: "tip-bot2 for Kees Cook" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: Kees Cook <keescook@...omium.org>, Borislav Petkov <bp@...e.de>,
Heiko Carstens <heiko.carstens@...ibm.com>,
Andy Lutomirski <luto@...nel.org>,
Arnd Bergmann <arnd@...db.de>,
Dave Hansen <dave.hansen@...ux.intel.com>,
linux-alpha@...r.kernel.org, linux-arch@...r.kernel.org,
linux-arm-kernel@...ts.infradead.org, linux-c6x-dev@...ux-c6x.org,
linux-ia64@...r.kernel.org, linux-s390@...r.kernel.org,
linuxppc-dev@...ts.ozlabs.org,
Michael Ellerman <mpe@...erman.id.au>,
Michal Simek <monstr@...str.eu>,
Rick Edgecombe <rick.p.edgecombe@...el.com>,
Segher Boessenkool <segher@...nel.crashing.org>,
Will Deacon <will@...nel.org>, "x86-ml" <x86@...nel.org>,
Yoshinori Sato <ysato@...rs.sourceforge.jp>,
Ingo Molnar <mingo@...nel.org>, Borislav Petkov <bp@...en8.de>,
linux-kernel@...r.kernel.org
Subject: [tip: x86/build] s390: Move RO_DATA into "text" PT_LOAD Program Header
The following commit has been merged into the x86/build branch of tip:
Commit-ID: 6434efbd9aefa3786b446c8e4745d1f49d2983b4
Gitweb: https://git.kernel.org/tip/6434efbd9aefa3786b446c8e4745d1f49d2983b4
Author: Kees Cook <keescook@...omium.org>
AuthorDate: Tue, 29 Oct 2019 14:13:28 -07:00
Committer: Borislav Petkov <bp@...e.de>
CommitterDate: Mon, 04 Nov 2019 15:34:32 +01:00
s390: Move RO_DATA into "text" PT_LOAD Program Header
In preparation for moving NOTES into RO_DATA, move RO_DATA back into the
"text" PT_LOAD Program Header, as done with other architectures. The
"data" PT_LOAD now starts with the writable data section.
Signed-off-by: Kees Cook <keescook@...omium.org>
Signed-off-by: Borislav Petkov <bp@...e.de>
Acked-by: Heiko Carstens <heiko.carstens@...ibm.com>
Cc: Andy Lutomirski <luto@...nel.org>
Cc: Arnd Bergmann <arnd@...db.de>
Cc: Dave Hansen <dave.hansen@...ux.intel.com>
Cc: linux-alpha@...r.kernel.org
Cc: linux-arch@...r.kernel.org
Cc: linux-arm-kernel@...ts.infradead.org
Cc: linux-c6x-dev@...ux-c6x.org
Cc: linux-ia64@...r.kernel.org
Cc: linux-s390@...r.kernel.org
Cc: linuxppc-dev@...ts.ozlabs.org
Cc: Michael Ellerman <mpe@...erman.id.au>
Cc: Michal Simek <monstr@...str.eu>
Cc: Rick Edgecombe <rick.p.edgecombe@...el.com>
Cc: Segher Boessenkool <segher@...nel.crashing.org>
Cc: Will Deacon <will@...nel.org>
Cc: x86-ml <x86@...nel.org>
Cc: Yoshinori Sato <ysato@...rs.sourceforge.jp>
Link: https://lkml.kernel.org/r/20191029211351.13243-7-keescook@chromium.org
---
arch/s390/kernel/vmlinux.lds.S | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S
index 7e0eb40..13294fe 100644
--- a/arch/s390/kernel/vmlinux.lds.S
+++ b/arch/s390/kernel/vmlinux.lds.S
@@ -52,7 +52,7 @@ SECTIONS
NOTES :text :note
- .dummy : { *(.dummy) } :data
+ .dummy : { *(.dummy) } :text
RO_DATA_SECTION(PAGE_SIZE)
@@ -64,7 +64,7 @@ SECTIONS
.data..ro_after_init : {
*(.data..ro_after_init)
JUMP_TABLE_DATA
- }
+ } :data
EXCEPTION_TABLE(16)
. = ALIGN(PAGE_SIZE);
__end_ro_after_init = .;
Powered by blists - more mailing lists