The following commit has been merged into the x86/build branch of tip: Commit-ID: de7156689d69e9861d9ddc54a9dea623c25020c5 Gitweb: https://git.kernel.org/tip/de7156689d69e9861d9ddc54a9dea623c25020c5 Author: Kees Cook <keescook@xxxxxxxxxxxx> AuthorDate: Mon, 11 Nov 2019 09:22:00 -08:00 Committer: Borislav Petkov <bp@xxxxxxx> CommitterDate: Tue, 12 Nov 2019 09:56:51 +01:00 m68k: Convert missed RODATA to RO_DATA I missed two instances of the old RODATA macro (seems I was searching for vmlinux.lds* not vmlinux*lds*). Fix both instances and double-check the entire tree for other "RODATA" instances in linker scripts. Fixes: c82318254d15 ("vmlinux.lds.h: Replace RODATA with RO_DATA") Reported-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx> Signed-off-by: Kees Cook <keescook@xxxxxxxxxxxx> Signed-off-by: Borislav Petkov <bp@xxxxxxx> Acked-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx> Cc: Heiko Carstens <heiko.carstens@xxxxxxxxxx> Cc: linux-m68k@xxxxxxxxxxxxxxxxxxxx Cc: Sam Creasey <sammy@xxxxxxxxx> Link: https://lkml.kernel.org/r/201911110920.5840E9AF1@keescook --- arch/m68k/kernel/vmlinux-std.lds | 2 +- arch/m68k/kernel/vmlinux-sun3.lds | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/m68k/kernel/vmlinux-std.lds b/arch/m68k/kernel/vmlinux-std.lds index 6e7eb49..4d33da4 100644 --- a/arch/m68k/kernel/vmlinux-std.lds +++ b/arch/m68k/kernel/vmlinux-std.lds @@ -31,7 +31,7 @@ SECTIONS _sdata = .; /* Start of data section */ - RODATA + RO_DATA(4096) RW_DATA(16, PAGE_SIZE, THREAD_SIZE) diff --git a/arch/m68k/kernel/vmlinux-sun3.lds b/arch/m68k/kernel/vmlinux-sun3.lds index 1a0ad6b..87d9f4d 100644 --- a/arch/m68k/kernel/vmlinux-sun3.lds +++ b/arch/m68k/kernel/vmlinux-sun3.lds @@ -24,7 +24,7 @@ SECTIONS *(.fixup) *(.gnu.warning) } :text = 0x4e75 - RODATA + RO_DATA(4096) _etext = .; /* End of text section */
