From e0e0acaa2a69d5dcd8ad724435604bc3686d7517 Mon Sep 17 00:00:00 2001 From: Nick Desaulniers Date: Tue, 10 Mar 2020 15:36:45 -0700 Subject: [PATCH] Revert "selinux: Relocate ss_initialized to a separate 4k page" This reverts commit 50ced54e5b3fcf38d43a61ba35f8c7c4fdb05f0a. 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. Bug: 151154720 Reported-by: Matthias Maennich Debugged-by: Fangrui Song Signed-off-by: Nick Desaulniers Change-Id: Iebb8135630132cd4ae49f3d2d1e85bd61cfa6111 --- security/selinux/ss/services.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c index b5cd832328b8..b818410d2418 100644 --- a/security/selinux/ss/services.c +++ b/security/selinux/ss/services.c @@ -80,7 +80,8 @@ static DEFINE_RWLOCK(policy_rwlock); static struct sidtab sidtab; struct policydb policydb; -int ss_initialized __aligned(0x1000) __attribute__((section(".bss_rtic"))); +int ss_initialized; + /* * The largest sequence number that has been used when * providing an access decision to the access vector cache.