Commit 7128578c authored by Christian Göttsche's avatar Christian Göttsche Committed by Paul Moore
Browse files

selinux: use consistent type for AV rule specifier 



The specifier for avtab keys is always supplied with a type of u16,
either as a macro to security_compute_sid() or the member specified of
the struct avtab_key.

Signed-off-by: default avatarChristian Göttsche <cgzones@googlemail.com>
Signed-off-by: default avatarPaul Moore <paul@paul-moore.com>
parent a13479bb

security/selinux/ss/avtab.c

+1 −1
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ struct avtab_node *avtab_search_node(struct avtab *h, 
}



struct avtab_node*

avtab_search_node_next(struct avtab_node *node, int specified)

avtab_search_node_next(struct avtab_node *node, u16 specified)

{

	struct avtab_node *cur;

security/selinux/ss/avtab.h

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ struct avtab_node *avtab_insert_nonunique(struct avtab *h, 
struct avtab_node *avtab_search_node(struct avtab *h,

				     const struct avtab_key *key);



struct avtab_node *avtab_search_node_next(struct avtab_node *node, int specified);

struct avtab_node *avtab_search_node_next(struct avtab_node *node, u16 specified);



#define MAX_AVTAB_HASH_BITS 16

#define MAX_AVTAB_HASH_BUCKETS (1 << MAX_AVTAB_HASH_BITS)

security/selinux/ss/services.c

+1 −1
Original line number Diff line number Diff line
@@ -1694,7 +1694,7 @@ static void filename_compute_type(struct policydb *policydb, 
static int security_compute_sid(u32 ssid,

				u32 tsid,

				u16 orig_tclass,

				u32 specified,

				u16 specified,

				const char *objname,

				u32 *out_sid,

				bool kern)