Revert "selinux: Relocate ss_initialized and selinux_enforcing to sep…

…arate 4k" This reverts commit 50240fa. That out of tree patch causes the resulting kernel image to be too large, causing ld.lld to error; since .bss is specified twice. Fixes the observed error: ld.lld: error: output file too large: 18446743524330100280 bytes when using LLD without LTO enabled. We observe similar errors with binutils 2.36+ Bug: 151154720 Reported-by: Matthias Maennich <[email protected]> Debugged-by: Fangrui Song <[email protected]> Signed-off-by: Nick Desaulniers <[email protected]> Change-Id: Iebb8135630132cd4ae49f3d2d1e85bd61cfa6111
PixelExperiencePlus · Apr 24, 2021 · 96abd16 · 96abd16
1 parent 6756121
commit 96abd16
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 11 deletions.
diff --git a/arch/arm64/kernel/vmlinux.lds.S b/arch/arm64/kernel/vmlinux.lds.S
@@ -68,10 +68,6 @@ jiffies = jiffies_64;
 #define TRAMP_TEXT
 #endif
 
-#define RTIC_BSS					\
-	. = ALIGN(PAGE_SIZE);				\
-	KEEP(*(.bss.rtic));			\
-	. = ALIGN(PAGE_SIZE);				\
 /*
  * The size of the PE/COFF section that covers the kernel image, which
  * runs from stext to _edata, must be a round multiple of the PE/COFF
@@ -252,10 +248,6 @@ SECTIONS
 	STABS_DEBUG
 
 	HEAD_SYMBOLS
-
-	.bss : {			/* bss segment		*/
-         RTIC_BSS
-	}
 }
 
 /*

diff --git a/include/linux/init.h b/include/linux/init.h
@@ -322,8 +322,6 @@ void __init parse_early_options(char *cmdline);
 /* Data marked not to be saved by software suspend */
 #define __nosavedata __section(.data..nosave)
 
-#define __rticdata  __attribute__((section(".bss.rtic")))
-
 #ifdef MODULE
 #define __exit_p(x) x
 #else

diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
@@ -100,7 +100,7 @@
 #include "audit.h"
 #include "avc_ss.h"
 
-struct selinux_state selinux_state __rticdata;
+struct selinux_state selinux_state;
 
 /* SECMARK reference count */
 static atomic_t selinux_secmark_refcount = ATOMIC_INIT(0);