Commit e872267b8bcbb179 ("jump_table: move entries into ro_after_init
region") moved the __jump_table input section into the __ro_after_init
output section, but inadvertently put the macro in the wrong place in
the s390 linker script. Let's fix that.
Fixes: e872267b8bcbb179 ("jump_table: move entries into ro_after_init region")
Reported-by: Guenter Roeck <[email protected]>
Cc: Heiko Carstens <[email protected]>
Cc: Kees Cook <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Martin Schwidefsky <[email protected]>
Cc: Jessica Yu <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Signed-off-by: Ard Biesheuvel <[email protected]>
---
arch/s390/kernel/vmlinux.lds.S | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S
index 4042bbf3f9ad..457713f48734 100644
--- a/arch/s390/kernel/vmlinux.lds.S
+++ b/arch/s390/kernel/vmlinux.lds.S
@@ -64,9 +64,9 @@ SECTIONS
__start_ro_after_init = .;
.data..ro_after_init : {
*(.data..ro_after_init)
+ JUMP_TABLE_DATA
}
EXCEPTION_TABLE(16)
- JUMP_TABLE_DATA
. = ALIGN(PAGE_SIZE);
__end_ro_after_init = .;
--
2.17.1
On Sun, Sep 30, 2018 at 9:49 AM, Ard Biesheuvel
<[email protected]> wrote:
> Commit e872267b8bcbb179 ("jump_table: move entries into ro_after_init
> region") moved the __jump_table input section into the __ro_after_init
> output section, but inadvertently put the macro in the wrong place in
> the s390 linker script. Let's fix that.
>
> Fixes: e872267b8bcbb179 ("jump_table: move entries into ro_after_init region")
> Reported-by: Guenter Roeck <[email protected]>
> Cc: Heiko Carstens <[email protected]>
> Cc: Kees Cook <[email protected]>
> Cc: Thomas Gleixner <[email protected]>
> Cc: Ingo Molnar <[email protected]>
> Cc: Martin Schwidefsky <[email protected]>
> Cc: Jessica Yu <[email protected]>
> Cc: Peter Zijlstra <[email protected]>
> Signed-off-by: Ard Biesheuvel <[email protected]>
Reviewed-by: Kees Cook <[email protected]>
-Kees
> ---
> arch/s390/kernel/vmlinux.lds.S | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S
> index 4042bbf3f9ad..457713f48734 100644
> --- a/arch/s390/kernel/vmlinux.lds.S
> +++ b/arch/s390/kernel/vmlinux.lds.S
> @@ -64,9 +64,9 @@ SECTIONS
> __start_ro_after_init = .;
> .data..ro_after_init : {
> *(.data..ro_after_init)
> + JUMP_TABLE_DATA
> }
> EXCEPTION_TABLE(16)
> - JUMP_TABLE_DATA
> . = ALIGN(PAGE_SIZE);
> __end_ro_after_init = .;
>
> --
> 2.17.1
>
--
Kees Cook
Pixel Security
On Sun, Sep 30, 2018 at 06:49:50PM +0200, Ard Biesheuvel wrote:
> Commit e872267b8bcbb179 ("jump_table: move entries into ro_after_init
> region") moved the __jump_table input section into the __ro_after_init
> output section, but inadvertently put the macro in the wrong place in
> the s390 linker script. Let's fix that.
>
> Fixes: e872267b8bcbb179 ("jump_table: move entries into ro_after_init region")
> Reported-by: Guenter Roeck <[email protected]>
> Cc: Heiko Carstens <[email protected]>
> Cc: Kees Cook <[email protected]>
> Cc: Thomas Gleixner <[email protected]>
> Cc: Ingo Molnar <[email protected]>
> Cc: Martin Schwidefsky <[email protected]>
> Cc: Jessica Yu <[email protected]>
> Cc: Peter Zijlstra <[email protected]>
> Signed-off-by: Ard Biesheuvel <[email protected]>
Tested-by: Guenter Roeck <[email protected]>
> ---
> arch/s390/kernel/vmlinux.lds.S | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S
> index 4042bbf3f9ad..457713f48734 100644
> --- a/arch/s390/kernel/vmlinux.lds.S
> +++ b/arch/s390/kernel/vmlinux.lds.S
> @@ -64,9 +64,9 @@ SECTIONS
> __start_ro_after_init = .;
> .data..ro_after_init : {
> *(.data..ro_after_init)
> + JUMP_TABLE_DATA
> }
> EXCEPTION_TABLE(16)
> - JUMP_TABLE_DATA
> . = ALIGN(PAGE_SIZE);
> __end_ro_after_init = .;
>
> --
> 2.17.1
>
On Sun, Sep 30, 2018 at 06:49:50PM +0200, Ard Biesheuvel wrote:
> Commit e872267b8bcbb179 ("jump_table: move entries into ro_after_init
> region") moved the __jump_table input section into the __ro_after_init
> output section, but inadvertently put the macro in the wrong place in
> the s390 linker script. Let's fix that.
>
> Fixes: e872267b8bcbb179 ("jump_table: move entries into ro_after_init region")
> Reported-by: Guenter Roeck <[email protected]>
> Cc: Heiko Carstens <[email protected]>
> Cc: Kees Cook <[email protected]>
> Cc: Thomas Gleixner <[email protected]>
> Cc: Ingo Molnar <[email protected]>
> Cc: Martin Schwidefsky <[email protected]>
> Cc: Jessica Yu <[email protected]>
> Cc: Peter Zijlstra <[email protected]>
> Signed-off-by: Ard Biesheuvel <[email protected]>
> ---
> arch/s390/kernel/vmlinux.lds.S | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Acked-by: Heiko Carstens <[email protected]>
I don't think this is very obvious, but this fixes current build breakage
in linux-next and I assume Thomas should pick this up.
> diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S
> index 4042bbf3f9ad..457713f48734 100644
> --- a/arch/s390/kernel/vmlinux.lds.S
> +++ b/arch/s390/kernel/vmlinux.lds.S
> @@ -64,9 +64,9 @@ SECTIONS
> __start_ro_after_init = .;
> .data..ro_after_init : {
> *(.data..ro_after_init)
> + JUMP_TABLE_DATA
> }
> EXCEPTION_TABLE(16)
> - JUMP_TABLE_DATA
> . = ALIGN(PAGE_SIZE);
> __end_ro_after_init = .;
>
> --
> 2.17.1
>
On 1 October 2018 at 22:25, Heiko Carstens <[email protected]> wrote:
> On Sun, Sep 30, 2018 at 06:49:50PM +0200, Ard Biesheuvel wrote:
>> Commit e872267b8bcbb179 ("jump_table: move entries into ro_after_init
>> region") moved the __jump_table input section into the __ro_after_init
>> output section, but inadvertently put the macro in the wrong place in
>> the s390 linker script. Let's fix that.
>>
>> Fixes: e872267b8bcbb179 ("jump_table: move entries into ro_after_init region")
>> Reported-by: Guenter Roeck <[email protected]>
>> Cc: Heiko Carstens <[email protected]>
>> Cc: Kees Cook <[email protected]>
>> Cc: Thomas Gleixner <[email protected]>
>> Cc: Ingo Molnar <[email protected]>
>> Cc: Martin Schwidefsky <[email protected]>
>> Cc: Jessica Yu <[email protected]>
>> Cc: Peter Zijlstra <[email protected]>
>> Signed-off-by: Ard Biesheuvel <[email protected]>
>> ---
>> arch/s390/kernel/vmlinux.lds.S | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> Acked-by: Heiko Carstens <[email protected]>
>
> I don't think this is very obvious, but this fixes current build breakage
> in linux-next and I assume Thomas should pick this up.
>
Indeed.
Thomas, Ingo,
Could you please take this fix for the jump lable changes queued in
-next, and the other one I sent out yesterday [0], through core/core
in tip.git as before?
Thanks,
Ard.
[0] https://lore.kernel.org/lkml/[email protected]/
Commit-ID: 57d15877033e44e9ac283b8c6e82cc67bf6a0aa6
Gitweb: https://git.kernel.org/tip/57d15877033e44e9ac283b8c6e82cc67bf6a0aa6
Author: Ard Biesheuvel <[email protected]>
AuthorDate: Sun, 30 Sep 2018 18:49:50 +0200
Committer: Thomas Gleixner <[email protected]>
CommitDate: Tue, 2 Oct 2018 08:08:08 +0200
s390/vmlinux.lds: Move JUMP_TABLE_DATA into output section
Commit e872267b8bcbb179 ("jump_table: move entries into ro_after_init
region") moved the __jump_table input section into the __ro_after_init
output section, but inadvertently put the macro in the wrong place in
the s390 linker script. Let's fix that.
Fixes: e872267b8bcbb179 ("jump_table: move entries into ro_after_init region")
Reported-by: Guenter Roeck <[email protected]>
Signed-off-by: Ard Biesheuvel <[email protected]>
Signed-off-by: Thomas Gleixner <[email protected]>
Reviewed-by: Kees Cook <[email protected]>
Acked-by: Heiko Carstens <[email protected]>
Tested-by: Guenter Roeck <[email protected]>
Cc: [email protected]
Cc: Martin Schwidefsky <[email protected]>
Cc: Jessica Yu <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Link: https://lkml.kernel.org/r/[email protected]
---
arch/s390/kernel/vmlinux.lds.S | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S
index 4042bbf3f9ad..457713f48734 100644
--- a/arch/s390/kernel/vmlinux.lds.S
+++ b/arch/s390/kernel/vmlinux.lds.S
@@ -64,9 +64,9 @@ SECTIONS
__start_ro_after_init = .;
.data..ro_after_init : {
*(.data..ro_after_init)
+ JUMP_TABLE_DATA
}
EXCEPTION_TABLE(16)
- JUMP_TABLE_DATA
. = ALIGN(PAGE_SIZE);
__end_ro_after_init = .;