Commit b8c2f776 authored Oct 29, 2019 by Kees Cook Committed by Borislav Petkov Nov 04, 2019

vmlinux.lds.h: Allow EXCEPTION_TABLE to live in RO_DATA



Many architectures have an EXCEPTION_TABLE that needs to be only
readable. As such, it should live in RO_DATA. Create a macro to identify
this case for the architectures that can move EXCEPTION_TABLE into
RO_DATA.

Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Borislav Petkov <bp@suse.de>
Acked-by: Will Deacon <will@kernel.org>
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: linuxppc-dev@lists.ozlabs.org
Cc: linux-s390@vger.kernel.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: x86-ml <x86@kernel.org>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Link: https://lkml.kernel.org/r/20191029211351.13243-15-keescook@chromium.org

parent c9174047

include/asm-generic/vmlinux.lds.h

+12 −0

Original line number	Diff line number	Diff line
		@@ -69,6 +69,17 @@
		#define NOTES_HEADERS_RESTORE
		#endif

		/*
		* Some architectures have non-executable read-only exception tables.
		* They can be added to the RO_DATA segment by specifying their desired
		* alignment.
		*/
		#ifdef RO_EXCEPTION_TABLE_ALIGN
		#define RO_EXCEPTION_TABLE EXCEPTION_TABLE(RO_EXCEPTION_TABLE_ALIGN)
		#else
		#define RO_EXCEPTION_TABLE
		#endif

		/* Align . to a 8 byte boundary equals to maximum function alignment. */
		#define ALIGN_FUNCTION() . = ALIGN(8)

		@@ -513,6 +524,7 @@
		__stop___modver = .; \
		} \
		\
		RO_EXCEPTION_TABLE \
		NOTES \
		\
		. = ALIGN((align)); \

Admin message