OSDN Git Service

m68k: Convert missed RODATA to RO_DATA
authorKees Cook <keescook@chromium.org>
Mon, 11 Nov 2019 17:22:00 +0000 (09:22 -0800)
committerBorislav Petkov <bp@suse.de>
Tue, 12 Nov 2019 08:56:51 +0000 (09:56 +0100)
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@linux-m68k.org>
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Borislav Petkov <bp@suse.de>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: linux-m68k@lists.linux-m68k.org
Cc: Sam Creasey <sammy@sammy.net>
Link: https://lkml.kernel.org/r/201911110920.5840E9AF1@keescook
arch/m68k/kernel/vmlinux-std.lds
arch/m68k/kernel/vmlinux-sun3.lds

index 6e7eb49..4d33da4 100644 (file)
@@ -31,7 +31,7 @@ SECTIONS
 
   _sdata = .;                  /* Start of data section */
 
-  RODATA
+  RO_DATA(4096)
 
   RW_DATA(16, PAGE_SIZE, THREAD_SIZE)
 
index 1a0ad6b..87d9f4d 100644 (file)
@@ -24,7 +24,7 @@ SECTIONS
        *(.fixup)
        *(.gnu.warning)
        } :text = 0x4e75
-       RODATA
+       RO_DATA(4096)
 
   _etext = .;                  /* End of text section */