Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2653812e authored by James Morris's avatar James Morris Committed by Eric Paris
Browse files

selinux: sparse fix: fix several warnings in the security server cod 



Fix several sparse warnings in the SELinux security server code.

Signed-off-by: default avatarJames Morris <jmorris@namei.org>
Signed-off-by: default avatarEric Paris <eparis@redhat.com>
parent 02f5daa5

security/selinux/hooks.c

+1 −4
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ 
#include "xfrm.h"

#include "netlabel.h"

#include "audit.h"

#include "avc_ss.h"



#define NUM_SEL_MNT_OPTS 5
@@ -278,10 +279,6 @@ static void superblock_free_security(struct super_block *sb) 
	kfree(sbsec);

}



/* The security server must be initialized before

   any labeling or access decisions can be provided. */

extern int ss_initialized;



/* The file system's label must be initialized prior to use. */



static const char *labeling_behaviors[6] = {

security/selinux/include/avc_ss.h

+6 −0
Original line number Diff line number Diff line
@@ -18,5 +18,11 @@ struct security_class_mapping { 


extern struct security_class_mapping secclass_map[];



/*

 * The security server must be initialized before

 * any labeling or access decisions can be provided.

 */

extern int ss_initialized;



#endif /* _SELINUX_AVC_SS_H_ */

security/selinux/ss/conditional.c

+1 −1
Original line number Diff line number Diff line
@@ -555,7 +555,7 @@ static int cond_write_av_list(struct policydb *p, 
	return 0;

}



int cond_write_node(struct policydb *p, struct cond_node *node,

static int cond_write_node(struct policydb *p, struct cond_node *node,

		    struct policy_file *fp)

{

	struct cond_expr *cur_expr;

security/selinux/ss/conditional.h

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include "avtab.h"

#include "symtab.h"

#include "policydb.h"

#include "../include/conditional.h"



#define COND_EXPR_MAXDEPTH 10

security/selinux/ss/policydb.c

+0 −2
Original line number Diff line number Diff line
@@ -1743,8 +1743,6 @@ static int policydb_bounds_sanity_check(struct policydb *p) 
	return 0;

}



extern int ss_initialized;



u16 string_to_security_class(struct policydb *p, const char *name)

{

	struct class_datum *cladatum;