2019-10-11 00:08:03

by Kees Cook

Subject: [PATCH v2 06/29] 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 <[email protected]>
---
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 = .;
--
2.17.1

2019-10-16 12:52:14

by Heiko Carstens

Subject: Re: [PATCH v2 06/29] s390: Move RO_DATA into "text" PT_LOAD Program Header

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 <[email protected]>
> ---
> 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 <[email protected]>