Commit 4b36cb77 authored by Ondrej Mosnacek's avatar Ondrej Mosnacek Committed by Paul Moore
Browse files

selinux: move status variables out of selinux_ss 



It fits more naturally in selinux_state, since it reflects also global
state (the enforcing and policyload fields).

Signed-off-by: default avatarOndrej Mosnacek <omosnace@redhat.com>
Reviewed-by: default avatarStephen Smalley <sds@tycho.nsa.gov>
Signed-off-by: default avatarPaul Moore <paul@paul-moore.com>
parent bb6d3fb3

security/selinux/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -6,9 +6,9 @@ 
obj-$(CONFIG_SECURITY_SELINUX) := selinux.o



selinux-y := avc.o hooks.o selinuxfs.o netlink.o nlmsgtab.o netif.o \

	     netnode.o netport.o \

	     netnode.o netport.o status.o \

	     ss/ebitmap.o ss/hashtab.o ss/symtab.o ss/sidtab.o ss/avtab.o \

	     ss/policydb.o ss/services.o ss/conditional.o ss/mls.o ss/status.o

	     ss/policydb.o ss/services.o ss/conditional.o ss/mls.o



selinux-$(CONFIG_SECURITY_NETWORK_XFRM) += xfrm.o

security/selinux/hooks.c

+1 −0
Original line number Diff line number Diff line
@@ -7161,6 +7161,7 @@ static __init int selinux_init(void) 
	selinux_state.checkreqprot = selinux_checkreqprot_boot;

	selinux_ss_init(&selinux_state.ss);

	selinux_avc_init(&selinux_state.avc);

	mutex_init(&selinux_state.status_lock);



	/* Set the security state for the initial task. */

	cred_init_security();

security/selinux/include/security.h

+4 −0
Original line number Diff line number Diff line
@@ -108,6 +108,10 @@ struct selinux_state { 
	bool checkreqprot;

	bool initialized;

	bool policycap[__POLICYDB_CAPABILITY_MAX];



	struct page *status_page;

	struct mutex status_lock;



	struct selinux_avc *avc;

	struct selinux_ss *ss;

} __randomize_layout;

security/selinux/ss/services.c

+0 −2
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ 
#include <linux/in.h>

#include <linux/sched.h>

#include <linux/audit.h>

#include <linux/mutex.h>

#include <linux/vmalloc.h>

#include <net/netlabel.h>
@@ -81,7 +80,6 @@ static struct selinux_ss selinux_ss; 
void selinux_ss_init(struct selinux_ss **ss)

{

	rwlock_init(&selinux_ss.policy_rwlock);

	mutex_init(&selinux_ss.status_lock);

	*ss = &selinux_ss;

}

security/selinux/ss/services.h

+0 −2
Original line number Diff line number Diff line
@@ -29,8 +29,6 @@ struct selinux_ss { 
	rwlock_t policy_rwlock;

	u32 latest_granting;

	struct selinux_map map;

	struct page *status_page;

	struct mutex status_lock;

} __randomize_layout;



void services_compute_xperms_drivers(struct extended_perms *xperms,