selinux: implement avtab_search() via avtab_search_node()
RFC PATCH 1/1 selinux: implement avtab_search() via avtab_search_node()
Deduplicate avtab_search() by using the identical implementation from avtab_search_node().
Signed-off-by Christian Göttsche <[email protected]>
--- security/selinux/ss/avtab.c | 32 -------------------------------- security/selinux/ss/avtab.h | 11 ++++++++++- 2 files changed, 10 insertions(+), 33 deletions(-)
security/selinux/ss/avtab.c +0 -32
@@ -180,38 +180,6 @@ struct avtab_node *avtab_insert_nonunique(struct avtab *h,return avtab_insert_node (h, hvalue, prev, key, datum); } -struct avtab_datum *avtab_search (struct avtab *h,const struct avtab_key *key) -{ -int hvalue; -struct avtab_node *cur; -u16 specified = key->specified & ~(AVTAB_ENABLED |AVTAB_ENABLED_OLD ); - -if (!h || !h->nslot) -return NULL ; - - hvalue =avtab_hash (key, h->mask); -for (cur = h->htable[hvalue]; cur; - cur = cur->next) { -if (key->source_type == cur->key.source_type && - key->target_type == cur->key.target_type && - key->target_class == cur->key.target_class && - (specified & cur->key.specified)) -return &cur->datum; - -if (key->source_type < cur->key.source_type) -break ; -if (key->source_type == cur->key.source_type && - key->target_type < cur->key.target_type) -break ; -if (key->source_type == cur->key.source_type && - key->target_type == cur->key.target_type && - key->target_class < cur->key.target_class) -break ; - } - -return NULL ; -} -/* This search function returns a node pointer, and can be used in * conjunction with avtab_search_next_node() */
security/selinux/ss/avtab.h +10 -1
@@ -90,7 +90,6 @@ struct avtab {void avtab_init (struct avtab *h);int avtab_alloc (struct avtab *,u32 );int avtab_alloc_dup (struct avtab *new,const struct avtab *orig); -struct avtab_datum *avtab_search (struct avtab *h,const struct avtab_key *k);void avtab_destroy (struct avtab *h);void avtab_hash_eval (struct avtab *h,const char *tag);
@@ -110,6 +109,16 @@ struct avtab_node *avtab_insert_nonunique(struct avtab *h,struct avtab_node *avtab_search_node (struct avtab *h,const struct avtab_key *key); +static inline struct avtab_datum *avtab_search (struct avtab *h, +const struct avtab_key *key) +{ +struct avtab_node *cur =avtab_search_node (h, key); + +if (cur) +return &cur->datum; + +return NULL ; +}struct avtab_node *avtab_search_node_next (struct avtab_node *node,int specified);
Signature · 1 line
2.40.1
Paul Moore
maintainerQuoted 9 lines · Christian Göttsche
Deduplicate
avtab_search()by using the identical implementation fromavtab_search_node().Signed-off-by Christian Göttsche <[email protected]>--- security/selinux/ss/avtab.c | 32 -------------------------------- security/selinux/ss/avtab.h | 11 ++++++++++- 2 files changed, 10 insertions(+), 33 deletions(-)
I only see three avtab_search() callers, and only one that actually cares about a return value other than NULL/non-NULL. With that in mind, how about we remove avtab_search() entirely and update security_compute_sid() to use avtab_search_node()? After all, it already uses it for the conditional rules lookup ... not sure why it doesn't use it everywhere?
Quoted 74 lines
security/selinux/ss/avtab.c +0
-32@@ -180,38 +180,6 @@ struct avtab_node *avtab_insert_nonunique(struct avtab *h,return avtab_insert_node (h, hvalue, prev, key, datum); } -struct avtab_datum *avtab_search (struct avtab *h,const struct avtab_key *key) -{ -int hvalue; -struct avtab_node *cur; -u16 specified = key->specified & ~(AVTAB_ENABLED |AVTAB_ENABLED_OLD ); - -if (!h || !h->nslot) -return NULL ; - - hvalue =avtab_hash (key, h->mask); -for (cur = h->htable[hvalue]; cur; - cur = cur->next) { -if (key->source_type == cur->key.source_type && - key->target_type == cur->key.target_type && - key->target_class == cur->key.target_class && - (specified & cur->key.specified)) -return &cur->datum; - -if (key->source_type < cur->key.source_type) -break ; -if (key->source_type == cur->key.source_type && - key->target_type < cur->key.target_type) -break ; -if (key->source_type == cur->key.source_type && - key->target_type == cur->key.target_type && - key->target_class < cur->key.target_class) -break ; - } - -return NULL ; -} -/* This search function returns a node pointer, and can be used in * conjunction with avtab_search_next_node() */ security/selinux/ss/avtab.h +10
-2@@ -90,7 +90,6 @@ struct avtab {void avtab_init (struct avtab *h);int avtab_alloc (struct avtab *,u32 );int avtab_alloc_dup (struct avtab *new,const struct avtab *orig); -struct avtab_datum *avtab_search (struct avtab *h,const struct avtab_key *k);void avtab_destroy (struct avtab *h);void avtab_hash_eval (struct avtab *h,const char *tag);@@ -110,6 +109,16 @@ struct avtab_node *avtab_insert_nonunique(struct avtab *h,struct avtab_node *avtab_search_node (struct avtab *h,const struct avtab_key *key); +static inline struct avtab_datum *avtab_search (struct avtab *h, +const struct avtab_key *key) +{ +struct avtab_node *cur =avtab_search_node (h, key); + +if (cur) +return &cur->datum; + +return NULL ; +}struct avtab_node *avtab_search_node_next (struct avtab_node *node,int specified); --2.40.1
Signature · 1 line
paul-moore.com