From: Kees Cook <keescook@chromium.org>
To: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Kees Cook <keescook@chromium.org>, Arnd Bergmann <arnd@arndb.de>,
Peter Zijlstra <peterz@infradead.org>,
linux-arch@vger.kernel.org, Jessica Yu <jeyu@kernel.org>,
Heiko Carstens <hca@linux.ibm.com>,
Vasily Gorbik <gor@linux.ibm.com>,
Christian Borntraeger <borntraeger@de.ibm.com>,
Alexander Egorenkov <egorenar@linux.ibm.com>,
Sven Schnelle <svens@linux.ibm.com>,
Ilya Leoshkevich <iii@linux.ibm.com>,
"Steven Rostedt (VMware)" <rostedt@goodmis.org>,
Ingo Molnar <mingo@kernel.org>,
Sami Tolvanen <samitolvanen@google.com>,
linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org,
linux-hardening@vger.kernel.org
Subject: [PATCH 1/4] vmlinux.lds.h: Use regular *RODATA and *RO_AFTER_INIT_DATA suffixes
Date: Wed, 1 Sep 2021 16:37:54 -0700 [thread overview]
Message-ID: <20210901233757.2571878-2-keescook@chromium.org> (raw)
In-Reply-To: <20210901233757.2571878-1-keescook@chromium.org>
Rename the various section macros that live in RODATA and
RO_AFTER_INIT_DATA. Just being called "DATA" implies they are expected
to be writable.
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: linux-arch@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
---
arch/s390/kernel/vmlinux.lds.S | 2 +-
include/asm-generic/vmlinux.lds.h | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S
index 63bdb9e1bfc1..93bc74c2a71b 100644
--- a/arch/s390/kernel/vmlinux.lds.S
+++ b/arch/s390/kernel/vmlinux.lds.S
@@ -64,7 +64,7 @@ SECTIONS
__start_ro_after_init = .;
.data..ro_after_init : {
*(.data..ro_after_init)
- JUMP_TABLE_DATA
+ JUMP_TABLE_RO_AFTER_INIT_DATA
} :data
EXCEPTION_TABLE(16)
. = ALIGN(PAGE_SIZE);
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index 62669b36a772..70c74fdf9c9b 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -128,7 +128,7 @@
* used to determine the order of the priority of each sched class in
* relation to each other.
*/
-#define SCHED_DATA \
+#define SCHED_RODATA \
STRUCT_ALIGN(); \
__begin_sched_classes = .; \
*(__idle_sched_class) \
@@ -396,13 +396,13 @@
. = __start_init_task + THREAD_SIZE; \
__end_init_task = .;
-#define JUMP_TABLE_DATA \
+#define JUMP_TABLE_RO_AFTER_INIT_DATA \
. = ALIGN(8); \
__start___jump_table = .; \
KEEP(*(__jump_table)) \
__stop___jump_table = .;
-#define STATIC_CALL_DATA \
+#define STATIC_CALL_RO_AFTER_INIT_DATA \
. = ALIGN(8); \
__start_static_call_sites = .; \
KEEP(*(.static_call_sites)) \
@@ -420,8 +420,8 @@
. = ALIGN(8); \
__start_ro_after_init = .; \
*(.data..ro_after_init) \
- JUMP_TABLE_DATA \
- STATIC_CALL_DATA \
+ JUMP_TABLE_RO_AFTER_INIT_DATA \
+ STATIC_CALL_RO_AFTER_INIT_DATA \
__end_ro_after_init = .;
#endif
@@ -433,7 +433,7 @@
.rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
__start_rodata = .; \
*(.rodata) *(.rodata.*) \
- SCHED_DATA \
+ SCHED_RODATA \
RO_AFTER_INIT_DATA /* Read only after init */ \
. = ALIGN(8); \
__start___tracepoints_ptrs = .; \
--
2.30.2
next prev parent reply other threads:[~2021-09-01 23:38 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-01 23:37 [PATCH 0/4] Fix ro_after_init vs static_call Kees Cook
2021-09-01 23:37 ` Kees Cook [this message]
2021-09-03 5:55 ` [PATCH 1/4] vmlinux.lds.h: Use regular *RODATA and *RO_AFTER_INIT_DATA suffixes Josh Poimboeuf
2021-09-03 8:17 ` Heiko Carstens
2021-09-01 23:37 ` [PATCH 2/4] vmlinux.lds.h: Split .static_call_sites from .static_call_tramp_key Kees Cook
2021-09-03 5:55 ` Josh Poimboeuf
2021-09-01 23:37 ` [PATCH 3/4] module: Use a list of strings for ro_after_init sections Kees Cook
2021-09-03 6:49 ` Josh Poimboeuf
2021-09-03 16:38 ` Kees Cook
2021-09-04 4:09 ` Josh Poimboeuf
2021-09-04 14:40 ` Kees Cook
2021-09-01 23:37 ` [PATCH 4/4] module: Include .static_call_sites in module ro_after_init Kees Cook
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=20210901233757.2571878-2-keescook@chromium.org \
--to=keescook@chromium.org \
--cc=arnd@arndb.de \
--cc=borntraeger@de.ibm.com \
--cc=egorenar@linux.ibm.com \
--cc=gor@linux.ibm.com \
--cc=hca@linux.ibm.com \
--cc=iii@linux.ibm.com \
--cc=jeyu@kernel.org \
--cc=jpoimboe@redhat.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
--cc=samitolvanen@google.com \
--cc=svens@linux.ibm.com \
--subject='Re: [PATCH 1/4] vmlinux.lds.h: Use regular *RODATA and *RO_AFTER_INIT_DATA suffixes' \
/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
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).