Linux-m68k Archive on lore.kernel.org
 help / color / Atom feed
* [PATCH] m68k: Convert missed RODATA to RO_DATA
@ 2019-11-11 17:22 Kees Cook
  2019-11-11 18:10 ` Geert Uytterhoeven
  2019-11-12  9:25 ` [tip: x86/build] " tip-bot2 for Kees Cook
  0 siblings, 2 replies; 3+ messages in thread
From: Kees Cook @ 2019-11-11 17:22 UTC (permalink / raw)
  To: Borislav Petkov; +Cc: Geert Uytterhoeven, linux-kernel, linux-m68k

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 <geert@linux-m68k.org>
Fixes: c82318254d15 ("vmlinux.lds.h: Replace RODATA with RO_DATA")
Signed-off-by: Kees Cook <keescook@chromium.org>
---
 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 6e7eb49ed985..4d33da4e7106 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 1a0ad6b6dd8c..87d9f4d08f65 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 */
 
-- 
2.17.1


-- 
Kees Cook

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] m68k: Convert missed RODATA to RO_DATA
  2019-11-11 17:22 [PATCH] m68k: Convert missed RODATA to RO_DATA Kees Cook
@ 2019-11-11 18:10 ` Geert Uytterhoeven
  2019-11-12  9:25 ` [tip: x86/build] " tip-bot2 for Kees Cook
  1 sibling, 0 replies; 3+ messages in thread
From: Geert Uytterhoeven @ 2019-11-11 18:10 UTC (permalink / raw)
  To: Kees Cook; +Cc: Borislav Petkov, Linux Kernel Mailing List, linux-m68k

On Mon, Nov 11, 2019 at 6:22 PM Kees Cook <keescook@chromium.org> wrote:
> 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 <geert@linux-m68k.org>
> Fixes: c82318254d15 ("vmlinux.lds.h: Replace RODATA with RO_DATA")
> Signed-off-by: Kees Cook <keescook@chromium.org>
> ---
>  arch/m68k/kernel/vmlinux-std.lds  | 2 +-
>  arch/m68k/kernel/vmlinux-sun3.lds | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)

Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

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

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [tip: x86/build] m68k: Convert missed RODATA to RO_DATA
  2019-11-11 17:22 [PATCH] m68k: Convert missed RODATA to RO_DATA Kees Cook
  2019-11-11 18:10 ` Geert Uytterhoeven
@ 2019-11-12  9:25 ` " tip-bot2 for Kees Cook
  1 sibling, 0 replies; 3+ messages in thread
From: tip-bot2 for Kees Cook @ 2019-11-12  9:25 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: Geert Uytterhoeven, Kees Cook, Borislav Petkov, Heiko Carstens,
	linux-m68k, Sam Creasey, Ingo Molnar, Borislav Petkov,
	linux-kernel

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@chromium.org>
AuthorDate:    Mon, 11 Nov 2019 09:22:00 -08:00
Committer:     Borislav Petkov <bp@suse.de>
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@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  | 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 */
 

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, back to index

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-11 17:22 [PATCH] m68k: Convert missed RODATA to RO_DATA Kees Cook
2019-11-11 18:10 ` Geert Uytterhoeven
2019-11-12  9:25 ` [tip: x86/build] " tip-bot2 for Kees Cook

Linux-m68k Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-m68k/0 linux-m68k/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-m68k linux-m68k/ https://lore.kernel.org/linux-m68k \
		linux-m68k@vger.kernel.org linux-m68k@lists.linux-m68k.org
	public-inbox-index linux-m68k

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-m68k


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git