vmlinux.lds.h: Move Program Header restoration into NOTES macro (fbe6a8e6) · Commits · 戴 / test

In preparation for moving NOTES into RO_DATA, make the Program Header assignment restoration be part of the NOTES macro itself. Signed-off-by:

Kees Cook <keescook@chromium.org> Signed-off-by:

Borislav Petkov <bp@suse.de> Acked-by: Heiko Carstens <heiko.carstens@de.ibm.com> # s390 Cc: Andy Lutomirski <luto@kernel.org> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Dave Hansen <dave.hansen@linux.intel.com> Cc: linux-alpha@vger.kernel.org Cc: linux-arch@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-c6x-dev@linux-c6x.org Cc: linux-ia64@vger.kernel.org Cc: linux-s390@vger.kernel.org Cc: linuxppc-dev@lists.ozlabs.org Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Michal Simek <monstr@monstr.eu> Cc: Rick Edgecombe <rick.p.edgecombe@intel.com> Cc: Segher Boessenkool <segher@kernel.crashing.org> Cc: Will Deacon <will@kernel.org> Cc: x86-ml <x86@kernel.org> Cc: Yoshinori Sato <ysato@users.sourceforge.jp> Link: https://lkml.kernel.org/r/20191029211351.13243-10-keescook@chromium.org

arch/alpha/kernel/vmlinux.lds.S

+1 −4

Original line number	Diff line number	Diff line
		@@ -34,10 +34,7 @@ SECTIONS
		swapper_pg_dir = SWAPPER_PGD;
		_etext = .; /* End of text section */

		NOTES :text :note
		.dummy : {
		*(.dummy)
		} :text
		NOTES

		RODATA
		EXCEPTION_TABLE(16)

arch/ia64/kernel/vmlinux.lds.S

+1 −3

Original line number	Diff line number	Diff line
		@@ -70,9 +70,7 @@ SECTIONS {
		/*
		* Read-only data
		*/
		NOTES :text :note /* put .notes in text and mark in PT_NOTE */
		code_continues : {
		} :text /* switch back to regular program... */
		NOTES

		EXCEPTION_TABLE(16)

arch/mips/kernel/vmlinux.lds.S

+1 −2

Original line number	Diff line number	Diff line
		@@ -81,8 +81,7 @@ SECTIONS
		__stop___dbe_table = .;
		}

		NOTES NOTES_HEADERS
		.dummy : { *(.dummy) } :text
		NOTES

		_sdata = .; /* Start of data section */
		RODATA

arch/powerpc/kernel/vmlinux.lds.S

+1 −3

Original line number	Diff line number	Diff line
		@@ -164,9 +164,7 @@ SECTIONS
		#endif
		EXCEPTION_TABLE(0)

		NOTES :text :note
		/* Restore program header away from PT_NOTE. */
		.dummy : { *(.dummy) } :text
		NOTES

		/*
		* Init sections discarded at runtime

arch/s390/kernel/vmlinux.lds.S

+1 −3

Original line number	Diff line number	Diff line
		@@ -52,9 +52,7 @@ SECTIONS
		_etext = .; /* End of text section */
		} :text = 0x0700

		NOTES :text :note

		.dummy : { *(.dummy) } :text
		NOTES

		RO_DATA_SECTION(PAGE_SIZE)

Admin message