| Message ID | 20191011000609.29728-7-keescook@chromium.org (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 6434efbd9aefa3786b446c8e4745d1f49d2983b4 |
| Headers | show |
| Series | vmlinux.lds.h: Refactor EXCEPTION_TABLE and NOTES | expand |
On Thu, Oct 10, 2019 at 05:05:46PM -0700, Kees Cook wrote: > 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@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 7e0eb4020917..13294fef473e 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 = .; Acked-by: Heiko Carstens <heiko.carstens@de.ibm.com>
diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S index 7e0eb4020917..13294fef473e 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 = .;
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@chromium.org> --- arch/s390/kernel/vmlinux.lds.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)