Revert "selinux: Relocate ss_initialized and selinux_enforcing to separate 4k"

This reverts commit d4807bd60d.

That out of tree patch causes the resulting kernel image to be too
large, causing ld.lld to error; likely due to the additional section and
alignment requirements.  Android and floral don't host virtual targets
and thus do not run at EL2 on arm64.

Bug: 63740206
Change-Id: I357bf4d5c7e29230746eacd51fef413acec06067
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
fourteen
Nick Desaulniers 6 years ago committed by Simon1511
parent 7bbfbaea51
commit d3fcd262a0
  1. 10
      arch/arm64/kernel/vmlinux.lds.S
  2. 2
      include/linux/init.h
  3. 2
      security/selinux/hooks.c

@ -68,12 +68,6 @@ jiffies = jiffies_64;
#define TRAMP_TEXT
#endif
#define RTIC_BSS \
. = ALIGN(PAGE_SIZE); \
VMLINUX_SYMBOL(__bss_rtic_start) = .; \
KEEP(*(.bss.rtic)) \
. = ALIGN(PAGE_SIZE); \
VMLINUX_SYMBOL(__bss_rtic_end) = .;
/*
* 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
@ -255,10 +249,6 @@ SECTIONS
STABS_DEBUG
HEAD_SYMBOLS
.bss : { /* bss segment */
RTIC_BSS
}
}
/*

@ -318,8 +318,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

@ -203,7 +203,7 @@ int selinux_enforcing;
// CONFIG_RKP_KDP
static int selinux_enforcing_boot __kdp_ro;
#else
static int selinux_enforcing_boot __rticdata;
static int selinux_enforcing_boot;
#endif
// ] SEC_SELINUX_PORTING_COMMON

Loading…
Cancel
Save