m68k: Convert missed RODATA to RO_DATA
Subsystems (2)
PATCH 1/1 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.
--- arch/m68k/kernel/vmlinux-std.lds | 2 +- arch/m68k/kernel/vmlinux-sun3.lds | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/m68k/kernel/vmlinux-std.lds +1 -1
@@ -31,7 +31,7 @@ SECTIONS _sdata = .; /* Start of data section */ - RODATA + RO_DATA(4096) RW_DATA(16, PAGE_SIZE, THREAD_SIZE)
arch/m68k/kernel/vmlinux-sun3.lds +1 -1
@@ -24,7 +24,7 @@ SECTIONS *(.fixup) *(.gnu.warning) } :text = 0x4e75 - RODATA + RO_DATA(4096) _etext = .; /* End of text section */
Signature · 5 lines
2.17.1 -- Kees Cook
Quoted 11 lines · Kees Cook
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.
Reported-by Geert Uytterhoeven <[email protected]>Fixes c82318254d15 ("vmlinux.lds.h: Replace RODATA with RO_DATA")Signed-off-by Kees Cook <[email protected]>--- arch/m68k/kernel/vmlinux-std.lds | 2 +- arch/m68k/kernel/vmlinux-sun3.lds | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
The following commit has been merged into the x86/build branch of tip:
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 <[email protected]> AuthorDate: Mon, 11 Nov 2019 09:22:00 -08:00 Committer: Borislav Petkov <[email protected]> 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.
--- arch/m68k/kernel/vmlinux-std.lds | 2 +- arch/m68k/kernel/vmlinux-sun3.lds | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/m68k/kernel/vmlinux-std.lds +1 -1
@@ -31,7 +31,7 @@ SECTIONS _sdata = .; /* Start of data section */ - RODATA + RO_DATA(4096) RW_DATA(16, PAGE_SIZE, THREAD_SIZE)
arch/m68k/kernel/vmlinux-sun3.lds +1 -1
@@ -24,7 +24,7 @@ SECTIONS *(.fixup) *(.gnu.warning) } :text = 0x4e75 - RODATA + RO_DATA(4096) _etext = .; /* End of text section */