vmlinux.lds.h: Move LSM_TABLE into INIT_DATA

kees · James Morris · commit 3ac946d12e34 · 2018-10-10T20:40:21.000-07:00
Since the struct lsm_info table is not an initcall, we can just move it
into INIT_DATA like all the other tables.

Signed-off-by: Kees Cook &lt;keescook@chromium.org&gt;
Reviewed-by: Casey Schaufler &lt;casey@schaufler-ca.com&gt;
Reviewed-by: John Johansen &lt;john.johansen@canonical.com&gt;
Reviewed-by: James Morris &lt;james.morris@microsoft.com&gt;
Signed-off-by: James Morris &lt;james.morris@microsoft.com&gt;
diff --git a/arch/arc/kernel/vmlinux.lds.S b/arch/arc/kernel/vmlinux.lds.S
@@ -71,7 +71,6 @@ SECTIONS
 		INIT_SETUP(L1_CACHE_BYTES)
 		INIT_CALLS
 		CON_INITCALL
-		SECURITY_INITCALL
 	}
 
 	.init.arch.info : {
diff --git a/arch/arm/kernel/vmlinux-xip.lds.S b/arch/arm/kernel/vmlinux-xip.lds.S
@@ -96,7 +96,6 @@ SECTIONS
 		INIT_SETUP(16)
 		INIT_CALLS
 		CON_INITCALL
-		SECURITY_INITCALL
 		INIT_RAM_FS
 	}
 
diff --git a/arch/arm64/kernel/vmlinux.lds.S b/arch/arm64/kernel/vmlinux.lds.S
@@ -166,7 +166,6 @@ SECTIONS
 		INIT_SETUP(16)
 		INIT_CALLS
 		CON_INITCALL
-		SECURITY_INITCALL
 		INIT_RAM_FS
 		*(.init.rodata.* .init.bss)	/* from the EFI stub */
 	}
diff --git a/arch/h8300/kernel/vmlinux.lds.S b/arch/h8300/kernel/vmlinux.lds.S
@@ -56,7 +56,6 @@ SECTIONS
 	__init_begin = .;
 	INIT_TEXT_SECTION(4)
 	INIT_DATA_SECTION(4)
-	SECURITY_INIT
 	__init_end = .;
 	_edata = . ;
 	_begin_data = LOADADDR(.data);
diff --git a/arch/microblaze/kernel/vmlinux.lds.S b/arch/microblaze/kernel/vmlinux.lds.S
@@ -117,8 +117,6 @@ SECTIONS {
 		CON_INITCALL
 	}
 
-	SECURITY_INIT
-
 	__init_end_before_initramfs = .;
 
 	.init.ramfs : AT(ADDR(.init.ramfs) - LOAD_OFFSET) {
diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S
@@ -212,8 +212,6 @@ SECTIONS
 		CON_INITCALL
 	}
 
-	SECURITY_INIT
-
 	. = ALIGN(8);
 	__ftr_fixup : AT(ADDR(__ftr_fixup) - LOAD_OFFSET) {
 		__start___ftr_fixup = .;
diff --git a/arch/um/include/asm/common.lds.S b/arch/um/include/asm/common.lds.S
@@ -53,8 +53,6 @@
 	CON_INITCALL
   }
 
-  SECURITY_INIT
-
   .exitcall : {
 	__exitcall_begin = .;
 	*(.exitcall.exit)
diff --git a/arch/xtensa/kernel/vmlinux.lds.S b/arch/xtensa/kernel/vmlinux.lds.S
@@ -197,7 +197,6 @@ SECTIONS
     INIT_SETUP(XCHAL_ICACHE_LINESIZE)
     INIT_CALLS
     CON_INITCALL
-    SECURITY_INITCALL
     INIT_RAM_FS
   }
 
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
@@ -203,6 +203,15 @@
 #define EARLYCON_TABLE()
 #endif
 
+#ifdef CONFIG_SECURITY
+#define LSM_TABLE()	. = ALIGN(8);					\
+			__start_lsm_info = .;				\
+			KEEP(*(.lsm_info.init))				\
+			__end_lsm_info = .;
+#else
+#define LSM_TABLE()
+#endif
+
 #define ___OF_TABLE(cfg, name)	_OF_TABLE_##cfg(name)
 #define __OF_TABLE(cfg, name)	___OF_TABLE(cfg, name)
 #define OF_TABLE(cfg, name)	__OF_TABLE(IS_ENABLED(cfg), name)
@@ -597,7 +606,8 @@
 	IRQCHIP_OF_MATCH_TABLE()					\
 	ACPI_PROBE_TABLE(irqchip)					\
 	ACPI_PROBE_TABLE(timer)						\
-	EARLYCON_TABLE()
+	EARLYCON_TABLE()						\
+	LSM_TABLE()
 
 #define INIT_TEXT							\
 	*(.init.text .init.text.*)					\
@@ -786,17 +796,6 @@
 		KEEP(*(.con_initcall.init))				\
 		__con_initcall_end = .;
 
-#define SECURITY_INITCALL						\
-		__start_lsm_info = .;					\
-		KEEP(*(.lsm_info.init))					\
-		__end_lsm_info = .;
-
-/* Older linker script style for security init. */
-#define SECURITY_INIT							\
-	.lsm_info.init : AT(ADDR(.lsm_info.init) - LOAD_OFFSET) {	\
-		LSM_INFO						\
-	}
-
 #ifdef CONFIG_BLK_DEV_INITRD
 #define INIT_RAM_FS							\
 	. = ALIGN(4);							\
@@ -963,7 +962,6 @@
 		INIT_SETUP(initsetup_align)				\
 		INIT_CALLS						\
 		CON_INITCALL						\
-		SECURITY_INITCALL					\
 		INIT_RAM_FS						\
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,6 @@ SECTIONS`
`71`	`71`	`INIT_SETUP(L1_CACHE_BYTES)`
`72`	`72`	`INIT_CALLS`
`73`	`73`	`CON_INITCALL`
`74`		`- SECURITY_INITCALL`
`75`	`74`	`}`
`76`	`75`
`77`	`76`	`.init.arch.info : {`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,6 @@ SECTIONS`
`96`	`96`	`INIT_SETUP(16)`
`97`	`97`	`INIT_CALLS`
`98`	`98`	`CON_INITCALL`
`99`		`- SECURITY_INITCALL`
`100`	`99`	`INIT_RAM_FS`
`101`	`100`	`}`
`102`	`101`
Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,6 @@ SECTIONS`
`166`	`166`	`INIT_SETUP(16)`
`167`	`167`	`INIT_CALLS`
`168`	`168`	`CON_INITCALL`
`169`		`- SECURITY_INITCALL`
`170`	`169`	`INIT_RAM_FS`
`171`	`170`	`(.init.rodata. .init.bss) /* from the EFI stub */`
`172`	`171`	`}`
Original file line number	Diff line number	Diff line change
`@@ -117,8 +117,6 @@ SECTIONS {`
`117`	`117`	`CON_INITCALL`
`118`	`118`	`}`
`119`	`119`
`120`		`- SECURITY_INIT`
`121`		`-`
`122`	`120`	`__init_end_before_initramfs = .;`
`123`	`121`
`124`	`122`	`.init.ramfs : AT(ADDR(.init.ramfs) - LOAD_OFFSET) {`
Original file line number	Diff line number	Diff line change
`@@ -212,8 +212,6 @@ SECTIONS`
`212`	`212`	`CON_INITCALL`
`213`	`213`	`}`
`214`	`214`
`215`		`- SECURITY_INIT`
`216`		`-`
`217`	`215`	`. = ALIGN(8);`
`218`	`216`	`__ftr_fixup : AT(ADDR(__ftr_fixup) - LOAD_OFFSET) {`
`219`	`217`	`__start___ftr_fixup = .;`
Original file line number	Diff line number	Diff line change
`@@ -53,8 +53,6 @@`
`53`	`53`	`CON_INITCALL`
`54`	`54`	`}`
`55`	`55`
`56`		`- SECURITY_INIT`
`57`		`-`
`58`	`56`	`.exitcall : {`
`59`	`57`	`__exitcall_begin = .;`
`60`	`58`	`*(.exitcall.exit)`
Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,6 @@ SECTIONS`
`197`	`197`	`INIT_SETUP(XCHAL_ICACHE_LINESIZE)`
`198`	`198`	`INIT_CALLS`
`199`	`199`	`CON_INITCALL`
`200`		`- SECURITY_INITCALL`
`201`	`200`	`INIT_RAM_FS`
`202`	`201`	`}`
`203`	`202`