Namespacing of security/selinux
PATCH 4/4 Namespacing of security/selinux
Final namespacing patch, including namespacing of functions prefixed with mls_.
Signed-off-by Thomas Liu <[email protected]>
--- security/selinux/ss/avtab.c | 2 +- security/selinux/ss/context.h | 20 ++++---- security/selinux/ss/ebitmap.c | 20 ++++---- security/selinux/ss/ebitmap.h | 28 +++++----- security/selinux/ss/mls.c | 102 +++++++++++++++++++------------------- security/selinux/ss/mls.h | 36 +++++++------- security/selinux/ss/mls_types.h | 24 +++++----- security/selinux/ss/policydb.c | 30 ++++++------ security/selinux/ss/policydb.h | 8 ++-- security/selinux/ss/services.c | 88 +++++++++++++++++----------------- 10 files changed, 179 insertions(+), 179 deletions(-)
security/selinux/ss/avtab.c +1 -1
@@ -125,7 +125,7 @@ selinux_avtab_insert_nonunique(struct selinux_avtab *h, struct selinux_avtab_keyreturn selinux_avtab_insert_node (h, hvalue, prev, cur, key, datum); } -struct selinux_avtab_datum *avtab_search (struct selinux_avtab *h,struct selinux_avtab_key *key) +struct selinux_avtab_datum *selinux_avtab_search (struct selinux_avtab *h,struct selinux_avtab_key *key) {int hvalue;struct selinux_avtab_node *cur;
security/selinux/ss/context.h +10 -10
@@ -28,16 +28,16 @@ struct selinux_context {u32 role;u32 type;u32 len;/* length of string in bytes */ -struct mls_range range; +struct selinux_mls_range range;char *str;/* string representation if context cannot be mapped. */ }; -static inline void mls_context_init (struct selinux_context *c) +static inline void selinux_mls_context_init (struct selinux_context *c) {memset (&c->range,0 ,sizeof (c->range)); } -static inline int mls_context_cpy (struct selinux_context *dst,struct selinux_context *src) +static inline int selinux_mls_context_cpy (struct selinux_context *dst,struct selinux_context *src) {int rc;
@@ -60,7 +60,7 @@ out:/* * Sets both levels in the MLS range of 'dst' to the low level of 'src'. */ -static inline int mls_context_cpy_low (struct selinux_context *dst,struct selinux_context *src) +static inline int selinux_mls_context_cpy_low (struct selinux_context *dst,struct selinux_context *src) {int rc;
@@ -80,7 +80,7 @@ out:return rc; } -static inline int mls_context_cmp (struct selinux_context *c1,struct selinux_context *c2) +static inline int selinux_mls_context_cmp (struct selinux_context *c1,struct selinux_context *c2) {if (!selinux_mls_enabled)return 1 ;
@@ -91,14 +91,14 @@ static inline int mls_context_cmp(struct selinux_context *c1, struct selinux_con selinux_ebitmap_cmp(&c1->range.level[1].cat, &c2->range.level[1].cat)); } -static inline void mls_context_destroy (struct selinux_context *c) +static inline void selinux_mls_context_destroy (struct selinux_context *c) {if (!selinux_mls_enabled)return ;selinux_ebitmap_destroy (&c->range.level[0 ].cat);selinux_ebitmap_destroy (&c->range.level[1 ].cat); -mls_context_init (c); +selinux_mls_context_init (c); }static inline void context_init (struct selinux_context *c)
@@ -122,7 +122,7 @@ static inline int context_cpy(struct selinux_context *dst, struct selinux_contex dst->str =NULL ; dst->len =0 ; } - rc =mls_context_cpy (dst, src); + rc =selinux_mls_context_cpy (dst, src);if (rc) {kfree (dst->str);return rc;
@@ -136,7 +136,7 @@ static inline void context_destroy(struct selinux_context *c)kfree (c->str); c->str =NULL ; c->len =0 ; -mls_context_destroy (c); +selinux_mls_context_destroy (c); }static inline int context_cmp (struct selinux_context *c1,struct selinux_context *c2)
@@ -148,7 +148,7 @@ static inline int context_cmp(struct selinux_context *c1, struct selinux_contextreturn ((c1->user == c2->user) && (c1->role == c2->role) && (c1->type == c2->type) && - mls_context_cmp(c1, c2)); + selinux_mls_context_cmp(c1, c2)); }#endif /* _SS_CONTEXT_H_ */
security/selinux/ss/ebitmap.c +10 -10
@@ -48,7 +48,7 @@ int selinux_ebitmap_cpy(struct selinux_ebitmap *dst, struct selinux_ebitmap *src {struct selinux_ebitmap_node *n, *new, *prev; -ebitmap_init (dst); +selinux_ebitmap_init (dst); n = src->node; prev =NULL ;while (n) {
@@ -74,7 +74,7 @@ int selinux_ebitmap_cpy(struct selinux_ebitmap *dst, struct selinux_ebitmap *src#ifdef CONFIG_NETLABEL /** -* ebitmap_netlbl_export - Export an selinux_ebitmap into a NetLabel category bitmap +* selinux_ebitmap_netlbl_export - Export an selinux_ebitmap into a NetLabel category bitmap * @ebmap: the selinux_ebitmap to export * @catmap: the NetLabel category bitmap *
@@ -93,7 +93,7 @@ int selinux_ebitmap_netlbl_export(struct selinux_ebitmap *ebmap,/* NetLabel's NETLBL_CATMAP_MAPTYPE is defined as an array of u64, * however, it is not always compatible with an array of unsigned long -* in ebitmap_node. +* in selinux_ebitmap_node. * In addition, you should pay attention the following implementation * assumes unsigned long has a width equal with or less than 64-bit. */
@@ -141,7 +141,7 @@ netlbl_export_failure: }/** -* ebitmap_netlbl_import - Import a NetLabel category bitmap into an ebitmap +* selinux_ebitmap_netlbl_import - Import a NetLabel category bitmap into an ebitmap * @ebmap: the selinux_ebitmap to import * @catmap: the NetLabel category bitmap *
@@ -160,7 +160,7 @@ int selinux_ebitmap_netlbl_import(struct selinux_ebitmap *ebmap,/* NetLabel's NETLBL_CATMAP_MAPTYPE is defined as an array of u64, * however, it is not always compatible with an array of unsigned long -* in ebitmap_node. +* in selinux_ebitmap_node. * In addition, you should pay attention the following implementation * assumes unsigned long has a width equal with or less than 64-bit. */
@@ -251,7 +251,7 @@ int selinux_ebitmap_get_bit(struct selinux_ebitmap *e, unsigned long bit) n = e->node;while (n && (n->startbit <= bit)) {if ((n->startbit +EBITMAP_SIZE ) > bit) -return ebitmap_node_get_bit (n, bit); +return selinux_ebitmap_node_get_bit (n, bit); n = n->next; }
@@ -267,11 +267,11 @@ int selinux_ebitmap_set_bit(struct selinux_ebitmap *e, unsigned long bit, int vawhile (n && n->startbit <= bit) {if ((n->startbit +EBITMAP_SIZE ) > bit) {if (value) { -ebitmap_node_set_bit (n, bit); +selinux_ebitmap_node_set_bit (n, bit); }else {unsigned int s; -ebitmap_node_clr_bit (n, bit); +selinux_ebitmap_node_clr_bit (n, bit); s =find_first_bit (n->maps,EBITMAP_SIZE );if (s <EBITMAP_SIZE )
@@ -309,7 +309,7 @@ int selinux_ebitmap_set_bit(struct selinux_ebitmap *e, unsigned long bit, int vareturn -ENOMEM ; new->startbit = bit - (bit %EBITMAP_SIZE ); -ebitmap_node_set_bit (new, bit); +selinux_ebitmap_node_set_bit (new, bit);if (!n)/* this node will be the highest map within the bitmap */
@@ -353,7 +353,7 @@ int selinux_ebitmap_read(struct selinux_ebitmap *e, void *fp)__le32 buf[3 ];int rc, i; -ebitmap_init (e); +selinux_ebitmap_init (e); rc =next_entry (buf, fp,sizeof buf);if (rc <0 )
security/selinux/ss/ebitmap.h +14 -14
@@ -35,10 +35,10 @@ struct selinux_ebitmap {u32 highbit;/* highest position in the total bitmap */ }; -#define ebitmap_length (e) ((e)->highbit) -#define ebitmap_startbit (e) ((e)->node ? (e)->node->startbit : 0) +#define selinux_ebitmap_length (e) ((e)->highbit) +#define selinux_ebitmap_startbit (e) ((e)->node ? (e)->node->startbit : 0) -static inline unsigned int ebitmap_start_positive (struct selinux_ebitmap *e, +static inline unsigned int selinux_ebitmap_start_positive (struct selinux_ebitmap *e,struct selinux_ebitmap_node **n) {unsigned int ofs;
@@ -48,15 +48,15 @@ static inline unsigned int ebitmap_start_positive(struct selinux_ebitmap *e,if (ofs <EBITMAP_SIZE )return (*n)->startbit + ofs; } -return ebitmap_length (e); +return selinux_ebitmap_length (e); } -static inline void ebitmap_init (struct selinux_ebitmap *e) +static inline void selinux_ebitmap_init (struct selinux_ebitmap *e) {memset (e,0 ,sizeof (*e)); } -static inline unsigned int ebitmap_next_positive (struct selinux_ebitmap *e, +static inline unsigned int selinux_ebitmap_next_positive (struct selinux_ebitmap *e,struct selinux_ebitmap_node **n,unsigned int bit) {
@@ -71,7 +71,7 @@ static inline unsigned int ebitmap_next_positive(struct selinux_ebitmap *e,if (ofs <EBITMAP_SIZE )return ofs + (*n)->startbit; } -return ebitmap_length (e); +return selinux_ebitmap_length (e); }#define EBITMAP_NODE_INDEX (node, bit) \
@@ -79,7 +79,7 @@ static inline unsigned int ebitmap_next_positive(struct selinux_ebitmap *e,#define EBITMAP_NODE_OFFSET (node, bit) \ (((bit) - (node)->startbit) % EBITMAP_UNIT_SIZE) -static inline int ebitmap_node_get_bit (struct selinux_ebitmap_node *n, +static inline int selinux_ebitmap_node_get_bit (struct selinux_ebitmap_node *n,unsigned int bit) {unsigned int index =EBITMAP_NODE_INDEX (n, bit);
@@ -91,7 +91,7 @@ static inline int ebitmap_node_get_bit(struct selinux_ebitmap_node *n,return 0 ; } -static inline void ebitmap_node_set_bit (struct selinux_ebitmap_node *n, +static inline void selinux_ebitmap_node_set_bit (struct selinux_ebitmap_node *n,unsigned int bit) {unsigned int index =EBITMAP_NODE_INDEX (n, bit);
@@ -101,7 +101,7 @@ static inline void ebitmap_node_set_bit(struct selinux_ebitmap_node *n, n->maps[index] |= (EBITMAP_BIT << ofs); } -static inline void ebitmap_node_clr_bit (struct selinux_ebitmap_node *n, +static inline void selinux_ebitmap_node_clr_bit (struct selinux_ebitmap_node *n,unsigned int bit) {unsigned int index =EBITMAP_NODE_INDEX (n, bit);
@@ -111,10 +111,10 @@ static inline void ebitmap_node_clr_bit(struct selinux_ebitmap_node *n, n->maps[index] &= ~(EBITMAP_BIT << ofs); } -#define ebitmap_for_each_positive_bit (e, n, bit) \ - for (bit = ebitmap_start_positive(e, &n); \ - bit < ebitmap_length(e); \ - bit = ebitmap_next_positive(e, &n, bit)) \ +#define selinux_ebitmap_for_each_positive_bit (e, n, bit) \ + for (bit = selinux_ebitmap_start_positive(e, &n); \ + bit < selinux_ebitmap_length(e); \ + bit = selinux_ebitmap_next_positive(e, &n, bit)) \int selinux_ebitmap_cmp (struct selinux_ebitmap *e1,struct selinux_ebitmap *e2);int selinux_ebitmap_cpy (struct selinux_ebitmap *dst,struct selinux_ebitmap *src);
security/selinux/ss/mls.c +51 -51
312 lines not on this page · raw message
security/selinux/ss/mls.h +18 -18
@@ -24,60 +24,60 @@#include "context.h" #include "policydb.h" -int mls_compute_context_len (struct selinux_context *context); -void mls_sid_to_context (struct selinux_context *context,char **scontext); -int mls_context_isvalid (struct selinux_policydb *p,struct selinux_context *c); -int mls_range_isvalid (struct selinux_policydb *p,struct mls_range *r); -int mls_level_isvalid (struct selinux_policydb *p,struct mls_level *l); +int selinux_mls_compute_context_len (struct selinux_context *context); +void selinux_mls_sid_to_context (struct selinux_context *context,char **scontext); +int selinux_mls_context_isvalid (struct selinux_policydb *p,struct selinux_context *c); +int selinux_mls_range_isvalid (struct selinux_policydb *p,struct selinux_mls_range *r); +int selinux_mls_level_isvalid (struct selinux_policydb *p,struct selinux_mls_level *l); -int mls_context_to_sid (struct selinux_policydb *p, +int selinux_mls_context_to_sid (struct selinux_policydb *p,char oldc,char **scontext,struct selinux_context *context,struct selinux_sidtab *s,u32 def_sid); -int mls_from_string (char *str,struct selinux_context *context,gfp_t gfp_mask); +int selinux_mls_from_string (char *str,struct selinux_context *context,gfp_t gfp_mask); -int mls_convert_context (struct selinux_policydb *oldp, +int selinux_mls_convert_context (struct selinux_policydb *oldp,struct selinux_policydb *newp,struct selinux_context *context); -int mls_compute_sid (struct selinux_context *scontext, +int selinux_mls_compute_sid (struct selinux_context *scontext,struct selinux_context *tcontext,u16 tclass,u32 specified,struct selinux_context *newcontext); -int mls_setup_user_range (struct selinux_context *fromcon,struct selinux_user_datum *user, +int selinux_mls_setup_user_range (struct selinux_context *fromcon,struct selinux_user_datum *user,struct selinux_context *usercon);#ifdef CONFIG_NETLABEL -void mls_export_netlbl_lvl (struct selinux_context *context, +void selinux_mls_export_netlbl_lvl (struct selinux_context *context,struct netlbl_lsm_secattr *secattr); -void mls_import_netlbl_lvl (struct selinux_context *context, +void selinux_mls_import_netlbl_lvl (struct selinux_context *context,struct netlbl_lsm_secattr *secattr); -int mls_export_netlbl_cat (struct selinux_context *context, +int selinux_mls_export_netlbl_cat (struct selinux_context *context,struct netlbl_lsm_secattr *secattr); -int mls_import_netlbl_cat (struct selinux_context *context, +int selinux_mls_import_netlbl_cat (struct selinux_context *context,struct netlbl_lsm_secattr *secattr);#else -static inline void mls_export_netlbl_lvl (struct selinux_context *context, +static inline void selinux_mls_export_netlbl_lvl (struct selinux_context *context,struct netlbl_lsm_secattr *secattr) {return ; } -static inline void mls_import_netlbl_lvl (struct selinux_context *context, +static inline void selinux_mls_import_netlbl_lvl (struct selinux_context *context,struct netlbl_lsm_secattr *secattr) {return ; } -static inline int mls_export_netlbl_cat (struct selinux_context *context, +static inline int selinux_mls_export_netlbl_cat (struct selinux_context *context,struct netlbl_lsm_secattr *secattr) {return -ENOMEM ; } -static inline int mls_import_netlbl_cat (struct selinux_context *context, +static inline int selinux_mls_import_netlbl_cat (struct selinux_context *context,struct netlbl_lsm_secattr *secattr) {return -ENOMEM ;
security/selinux/ss/mls_types.h +12 -12
@@ -16,16 +16,16 @@#include "security.h" -struct mls_level { +struct selinux_mls_level {u32 sens;/* sensitivity */ struct selinux_ebitmap cat;/* category set */ }; -struct mls_range { -struct mls_level level[2 ];/* low == level[0], high == level[1] */ +struct selinux_mls_range { +struct selinux_mls_level level[2 ];/* low == level[0], high == level[1] */ }; -static inline int mls_level_eq (struct mls_level *l1,struct mls_level *l2) +static inline int selinux_mls_level_eq (struct selinux_mls_level *l1,struct selinux_mls_level *l2) {if (!selinux_mls_enabled)return 1 ;
@@ -34,7 +34,7 @@ static inline int mls_level_eq(struct mls_level *l1, struct mls_level *l2) selinux_ebitmap_cmp(&l1->cat, &l2->cat)); } -static inline int mls_level_dom (struct mls_level *l1,struct mls_level *l2) +static inline int selinux_mls_level_dom (struct selinux_mls_level *l1,struct selinux_mls_level *l2) {if (!selinux_mls_enabled)return 1 ;
@@ -43,14 +43,14 @@ static inline int mls_level_dom(struct mls_level *l1, struct mls_level *l2) selinux_ebitmap_contains(&l1->cat, &l2->cat)); } -#define mls_level_incomp (l1, l2) \ -(!mls_level_dom((l1), (l2)) && !mls_level_dom((l2), (l1))) +#define selinux_mls_level_incomp (l1, l2) \ +(!selinux_mls_level_dom((l1), (l2)) && !selinux_mls_level_dom((l2), (l1))) -#define mls_level_between (l1, l2, l3) \ -(mls_level_dom((l1), (l2)) && mls_level_dom((l3), (l1))) +#define selinux_mls_level_between (l1, l2, l3) \ +(selinux_mls_level_dom((l1), (l2)) && selinux_mls_level_dom((l3), (l1))) -#define mls_range_contains (r1, r2) \ -(mls_level_dom(&(r2).level[0], &(r1).level[0]) && \ - mls_level_dom(&(r1).level[1], &(r2).level[1])) +#define selinux_mls_range_contains (r1, r2) \ +(selinux_mls_level_dom(&(r2).level[0], &(r1).level[0]) && \ + selinux_mls_level_dom(&(r1).level[1], &(r2).level[1]))#endif /* _SS_MLS_TYPES_H_ */
security/selinux/ss/policydb.c +15 -15
@@ -204,8 +204,8 @@ static int policydb_init(struct selinux_policydb *p)if (rc) goto out_free_symtab; -ebitmap_init (&p->policycaps); -ebitmap_init (&p->permissive_map); +selinux_ebitmap_init (&p->policycaps); +selinux_ebitmap_init (&p->permissive_map); out:return rc;
@@ -816,7 +816,7 @@ int policydb_context_isvalid(struct selinux_policydb *p, struct selinux_contextreturn 0 ; } -if (!mls_context_isvalid (p, c)) +if (!selinux_mls_context_isvalid (p, c))return 0 ;return 1 ;
@@ -826,7 +826,7 @@ int policydb_context_isvalid(struct selinux_policydb *p, struct selinux_context* Read a MLS range structure from a policydb binary * representation file. */ -static int mls_read_range_helper (struct mls_range *r,void *fp) +static int selinux_mls_read_range_helper (struct selinux_mls_range *r,void *fp) {__le32 buf[2 ];u32 items;
@@ -902,7 +902,7 @@ static int context_read_and_validate(struct selinux_context *c, c->role =le32_to_cpu (buf[1 ]); c->type =le32_to_cpu (buf[2 ]);if (p->policyvers >=POLICYDB_VERSION_MLS ) { -if (mls_read_range_helper (&c->range, fp)) { +if (selinux_mls_read_range_helper (&c->range, fp)) {printk (KERN_ERR "SELinux: error reading MLS range of " "context\n" ); rc = -EINVAL ;
@@ -1320,7 +1320,7 @@ bad:* Read a MLS level structure from a policydb binary * representation file. */ -static int mls_read_level (struct mls_level *lp,void *fp) +static int selinux_mls_read_level (struct selinux_mls_level *lp,void *fp) {__le32 buf[1 ];int rc;
@@ -1387,10 +1387,10 @@ static int user_read(struct selinux_policydb *p, struct selinux_hashtab *h, void goto bad;if (p->policyvers >=POLICYDB_VERSION_MLS ) { - rc =mls_read_range_helper (&usrdatum->range, fp); + rc =selinux_mls_read_range_helper (&usrdatum->range, fp);if (rc) goto bad; - rc =mls_read_level (&usrdatum->dfltlevel, fp); + rc =selinux_mls_read_level (&usrdatum->dfltlevel, fp);if (rc) goto bad; }
@@ -1436,12 +1436,12 @@ static int sens_read(struct selinux_policydb *p, struct selinux_hashtab *h, void goto bad; key[len] ='\0' ; - levdatum->level =kmalloc (sizeof (struct mls_level ),GFP_ATOMIC ); + levdatum->level =kmalloc (sizeof (struct selinux_mls_level ),GFP_ATOMIC );if (!levdatum->level) { rc = -ENOMEM ; goto bad; } -if (mls_read_level (levdatum->level, fp)) { +if (selinux_mls_read_level (levdatum->level, fp)) { rc = -EINVAL ; goto bad; }
@@ -1530,7 +1530,7 @@ static int user_bounds_sanity_check(void *key, void *datum, void *datap) } upper = p->user_val_to_struct[upper->bounds -1 ]; -ebitmap_for_each_positive_bit (&user->roles, node, bit) { +selinux_ebitmap_for_each_positive_bit (&user->roles, node, bit) {if (selinux_ebitmap_get_bit (&upper->roles, bit))continue ;
@@ -1567,7 +1567,7 @@ static int role_bounds_sanity_check(void *key, void *datum, void *datap) } upper = p->role_val_to_struct[upper->bounds -1 ]; -ebitmap_for_each_positive_bit (&role->types, node, bit) { +selinux_ebitmap_for_each_positive_bit (&role->types, node, bit) {if (selinux_ebitmap_get_bit (&upper->types, bit))continue ;
@@ -2108,10 +2108,10 @@ int policydb_read(struct selinux_policydb *p, void *fp) rc = -EINVAL ; goto bad; } - rc =mls_read_range_helper (&rt->target_range, fp); + rc =selinux_mls_read_range_helper (&rt->target_range, fp);if (rc) goto bad; -if (!mls_range_isvalid (p, &rt->target_range)) { +if (!selinux_mls_range_isvalid (p, &rt->target_range)) {printk (KERN_WARNING "SELinux: rangetrans: invalid range\n" ); goto bad; }
@@ -2124,7 +2124,7 @@ int policydb_read(struct selinux_policydb *p, void *fp) goto bad;for (i =0 ; i < p->p_types.nprim; i++) { -ebitmap_init (&p->type_attr_map[i]); +selinux_ebitmap_init (&p->type_attr_map[i]);if (p->policyvers >=POLICYDB_VERSION_AVTAB ) {if (selinux_ebitmap_read (&p->type_attr_map[i], fp)) goto bad;
security/selinux/ss/policydb.h +4 -4
@@ -92,14 +92,14 @@ struct selinux_user_datum {u32 value;/* internal user value */ u32 bounds;/* bounds of user */ struct selinux_ebitmap roles;/* set of authorized roles for user */ -struct mls_range range;/* MLS range (min - max) for user */ -struct mls_level dfltlevel;/* default login MLS level for user */ +struct selinux_mls_range range;/* MLS range (min - max) for user */ +struct selinux_mls_level dfltlevel;/* default login MLS level for user */ };/* Sensitivity attributes */ struct selinux_level_datum { -struct mls_level *level;/* sensitivity and associated categories */ +struct selinux_mls_level *level;/* sensitivity and associated categories */ unsigned char isalias;/* is this sensitivity an alias for another? */ };
@@ -113,7 +113,7 @@ struct selinux_range_trans {u32 source_type;u32 target_type;u32 target_class; -struct mls_range target_range; +struct selinux_mls_range target_range;struct selinux_range_trans *next; };
security/selinux/ss/services.c +44 -44
257 lines not on this page · raw message
Signature · 9 lines
1.6.2.5 -- This message was distributed to subscribers of the selinux mailing list. If you no longer wish to subscribe, send mail to [email protected] with the words "unsubscribe selinux" without quotes as the message.