Namespacing of security/selinux
PATCH 3/4 Namespacing of security/selinux
Namespacing of security/selinux/ss/policydb.h
Signed-off-by Thomas Liu <[email protected]>
--- security/selinux/ss/avtab.c | 4 +- security/selinux/ss/avtab.h | 6 +- security/selinux/ss/conditional.c | 26 ++-- security/selinux/ss/conditional.h | 12 +- security/selinux/ss/context.h | 20 ++-- security/selinux/ss/mls.c | 62 +++++----- security/selinux/ss/mls.h | 50 ++++---- security/selinux/ss/policydb.c | 164 +++++++++++----------- security/selinux/ss/policydb.h | 86 ++++++------ security/selinux/ss/services.c | 270 ++++++++++++++++++------------------ security/selinux/ss/services.h | 2 +- security/selinux/ss/sidtab.c | 52 ++++---- security/selinux/ss/sidtab.h | 34 +++--- security/selinux/ss/symtab.c | 2 +- security/selinux/ss/symtab.h | 4 +- 15 files changed, 397 insertions(+), 397 deletions(-)
security/selinux/ss/avtab.c +2 -2
@@ -323,7 +323,7 @@ static uint16_t spec_order[] = { AVTAB_MEMBER }; -int selinux_avtab_read_item (struct selinux_avtab *a,void *fp,struct policydb *pol, +int selinux_avtab_read_item (struct selinux_avtab *a,void *fp,struct selinux_policydb *pol,int (*insertf)(struct selinux_avtab *a,struct selinux_avtab_key *k,struct selinux_avtab_datum *d,void *p),void *p)
@@ -457,7 +457,7 @@ static int avtab_insertf(struct selinux_avtab *a, struct selinux_avtab_key *k,return avtab_insert (a, k, d); } -int selinux_avtab_read (struct selinux_avtab *a,void *fp,struct policydb *pol) +int selinux_avtab_read (struct selinux_avtab *a,void *fp,struct selinux_policydb *pol) {int rc;__le32 buf[1 ];
security/selinux/ss/avtab.h +3 -3
@@ -64,13 +64,13 @@ struct selinux_avtab_datum *selinux_avtab_search(struct selinux_avtab *h, structvoid selinux_avtab_destroy (struct selinux_avtab *h);void selinux_avtab_hash_eval (struct selinux_avtab *h,char *tag); -struct policydb ; -int selinux_avtab_read_item (struct selinux_avtab *a,void *fp,struct policydb *pol, +struct selinux_policydb ; +int selinux_avtab_read_item (struct selinux_avtab *a,void *fp,struct selinux_policydb *pol,int (*insert)(struct selinux_avtab *a,struct selinux_avtab_key *k,struct selinux_avtab_datum *d,void *p),void *p); -int selinux_avtab_read (struct selinux_avtab *a,void *fp,struct policydb *pol); +int selinux_avtab_read (struct selinux_avtab *a,void *fp,struct selinux_policydb *pol);struct selinux_avtab_node *selinux_avtab_insert_nonunique (struct selinux_avtab *h,struct selinux_avtab_key *key,struct selinux_avtab_datum *datum);
security/selinux/ss/conditional.c +13 -13
@@ -22,7 +22,7 @@* or undefined (-1). Undefined occurs when the expression * exceeds the stack depth of COND_EXPR_MAXDEPTH. */ -static int cond_evaluate_expr (struct policydb *p,struct selinux_cond_expr *expr) +static int cond_evaluate_expr (struct selinux_policydb *p,struct selinux_cond_expr *expr) {struct selinux_cond_expr *cur;
@@ -86,7 +86,7 @@ static int cond_evaluate_expr(struct policydb *p, struct selinux_cond_expr *expr* list appropriately. If the result of the expression is undefined * all of the rules are disabled for safety. */ -int selinux_evaluate_cond_node (struct policydb *p,struct selinux_cond_node *node) +int selinux_evaluate_cond_node (struct selinux_policydb *p,struct selinux_cond_node *node) {int new_state;struct selinux_cond_av_list *cur;
@@ -115,7 +115,7 @@ int selinux_evaluate_cond_node(struct policydb *p, struct selinux_cond_node *nodreturn 0 ; } -int selinux_cond_policydb_init (struct policydb *p) +int selinux_cond_policydb_init (struct selinux_policydb *p) { p->bool_val_to_struct =NULL ; p->cond_list =NULL ;
@@ -161,14 +161,14 @@ static void cond_list_destroy(struct selinux_cond_node *list) } } -void selinux_cond_policydb_destroy (struct policydb *p) +void selinux_cond_policydb_destroy (struct selinux_policydb *p) {kfree (p->bool_val_to_struct);selinux_avtab_destroy (&p->te_cond_avtab);cond_list_destroy (p->cond_list); } -int selinux_cond_init_bool_indexes (struct policydb *p) +int selinux_cond_init_bool_indexes (struct selinux_policydb *p) {kfree (p->bool_val_to_struct); p->bool_val_to_struct = (struct selinux_cond_bool_datum **)
@@ -187,7 +187,7 @@ int selinux_cond_destroy_bool(void *key, void *datum, void *p)int selinux_cond_index_bool (void *key,void *datum,void *datap) { -struct policydb *p; +struct selinux_policydb *p;struct selinux_cond_bool_datum *booldatum; booldatum = datum;
@@ -209,7 +209,7 @@ static int bool_isvalid(struct selinux_cond_bool_datum *b)return 1 ; } -int selinux_cond_read_bool (struct policydb *p,struct selinux_hashtab *h,void *fp) +int selinux_cond_read_bool (struct selinux_policydb *p,struct selinux_hashtab *h,void *fp) {char *key =NULL ;struct selinux_cond_bool_datum *booldatum;
@@ -250,7 +250,7 @@ err: }struct cond_insertf_data { -struct policydb *p; +struct selinux_policydb *p;struct selinux_cond_av_list *other;struct selinux_cond_av_list *head;struct selinux_cond_av_list *tail;
@@ -259,7 +259,7 @@ struct cond_insertf_data {static int cond_insertf (struct selinux_avtab *a,struct selinux_avtab_key *k,struct selinux_avtab_datum *d,void *ptr) {struct cond_insertf_data *data = ptr; -struct policydb *p = data->p; +struct selinux_policydb *p = data->p;struct selinux_cond_av_list *other = data->other, *list, *cur;struct selinux_avtab_node *node_ptr;u8 found;
@@ -334,7 +334,7 @@ err:return -1 ; } -static int cond_read_av_list (struct policydb *p,void *fp,struct selinux_cond_av_list **ret_list,struct selinux_cond_av_list *other) +static int cond_read_av_list (struct selinux_policydb *p,void *fp,struct selinux_cond_av_list **ret_list,struct selinux_cond_av_list *other) {int i, rc;__le32 buf[1 ];
@@ -368,7 +368,7 @@ static int cond_read_av_list(struct policydb *p, void *fp, struct selinux_cond_areturn 0 ; } -static int expr_isvalid (struct policydb *p,struct selinux_cond_expr *expr) +static int expr_isvalid (struct selinux_policydb *p,struct selinux_cond_expr *expr) {if (expr->expr_type <=0 || expr->expr_type >COND_LAST ) {printk (KERN_ERR "SELinux: conditional expressions uses unknown operator.\n" );
@@ -382,7 +382,7 @@ static int expr_isvalid(struct policydb *p, struct selinux_cond_expr *expr)return 1 ; } -static int cond_read_node (struct policydb *p,struct selinux_cond_node *node,void *fp) +static int cond_read_node (struct selinux_policydb *p,struct selinux_cond_node *node,void *fp) {__le32 buf[2 ];u32 len, i;
@@ -437,7 +437,7 @@ err:return -1 ; } -int selinux_cond_read_list (struct policydb *p,void *fp) +int selinux_cond_read_list (struct selinux_policydb *p,void *fp) {struct selinux_cond_node *node, *last =NULL ;__le32 buf[1 ];
security/selinux/ss/conditional.h +6 -6
@@ -59,19 +59,19 @@ struct selinux_cond_node {struct selinux_cond_node *next; }; -int selinux_cond_policydb_init (struct policydb *p); -void selinux_cond_policydb_destroy (struct policydb *p); +int selinux_cond_policydb_init (struct selinux_policydb *p); +void selinux_cond_policydb_destroy (struct selinux_policydb *p); -int selinux_cond_init_bool_indexes (struct policydb *p); +int selinux_cond_init_bool_indexes (struct selinux_policydb *p);int selinux_cond_destroy_bool (void *key,void *datum,void *p);int selinux_cond_index_bool (void *key,void *datum,void *datap); -int selinux_cond_read_bool (struct policydb *p,struct selinux_hashtab *h,void *fp); -int selinux_cond_read_list (struct policydb *p,void *fp); +int selinux_cond_read_bool (struct selinux_policydb *p,struct selinux_hashtab *h,void *fp); +int selinux_cond_read_list (struct selinux_policydb *p,void *fp);void selinux_cond_compute_av (struct selinux_avtab *ctab,struct selinux_avtab_key *key,struct av_decision *avd); -int selinux_evaluate_cond_node (struct policydb *p,struct selinux_cond_node *node); +int selinux_evaluate_cond_node (struct selinux_policydb *p,struct selinux_cond_node *node);#endif /* _CONDITIONAL_H_ */
security/selinux/ss/context.h +10 -10
@@ -23,7 +23,7 @@* A security context consists of an authenticated user * identity, a role, a type and a MLS range. */ -struct context { +struct selinux_context {u32 user;u32 role;u32 type;
@@ -32,12 +32,12 @@ struct context {char *str;/* string representation if context cannot be mapped. */ }; -static inline void mls_context_init (struct context *c) +static inline void mls_context_init (struct selinux_context *c) {memset (&c->range,0 ,sizeof (c->range)); } -static inline int mls_context_cpy (struct context *dst,struct context *src) +static inline int 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 context *dst,struct context *src) +static inline int 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 context *c1,struct context *c2) +static inline int mls_context_cmp (struct selinux_context *c1,struct selinux_context *c2) {if (!selinux_mls_enabled)return 1 ;
@@ -91,7 +91,7 @@ static inline int mls_context_cmp(struct context *c1, struct context *c2) selinux_ebitmap_cmp(&c1->range.level[1].cat, &c2->range.level[1].cat)); } -static inline void mls_context_destroy (struct context *c) +static inline void mls_context_destroy (struct selinux_context *c) {if (!selinux_mls_enabled)return ;
@@ -101,12 +101,12 @@ static inline void mls_context_destroy(struct context *c)mls_context_init (c); } -static inline void context_init (struct context *c) +static inline void context_init (struct selinux_context *c) {memset (c,0 ,sizeof (*c)); } -static inline int context_cpy (struct context *dst,struct context *src) +static inline int context_cpy (struct selinux_context *dst,struct selinux_context *src) {int rc;
@@ -130,7 +130,7 @@ static inline int context_cpy(struct context *dst, struct context *src)return 0 ; } -static inline void context_destroy (struct context *c) +static inline void context_destroy (struct selinux_context *c) { c->user = c->role = c->type =0 ;kfree (c->str);
@@ -139,7 +139,7 @@ static inline void context_destroy(struct context *c)mls_context_destroy (c); } -static inline int context_cmp (struct context *c1,struct context *c2) +static inline int context_cmp (struct selinux_context *c1,struct selinux_context *c2) {if (c1->len && c2->len)return (c1->len == c2->len && !strcmp (c1->str, c2->str));
security/selinux/ss/mls.c +31 -31
175 lines not on this page · raw message
security/selinux/ss/mls.h +25 -25
85 lines not on this page · raw message
security/selinux/ss/policydb.c +82 -82
473 lines not on this page · raw message
security/selinux/ss/policydb.h +43 -43
213 lines not on this page · raw message
security/selinux/ss/services.c +135 -135
783 lines not on this page · raw message
security/selinux/ss/services.h +1 -1
@@ -9,7 +9,7 @@#include "policydb.h" #include "sidtab.h" -extern struct policydb policydb; +extern struct selinux_policydb policydb;#endif /* _SS_SERVICES_H_ */
security/selinux/ss/sidtab.c +26 -26
148 lines not on this page · raw message
security/selinux/ss/sidtab.h +17 -17
@@ -9,10 +9,10 @@#include "context.h" -struct sidtab_node { +struct selinux_sidtab_node {u32 sid;/* security identifier */ -struct context context;/* security context structure */ -struct sidtab_node *next; +struct selinux_context context;/* security context structure */ +struct selinux_sidtab_node *next; };#define SIDTAB_HASH_BITS 7
@@ -21,33 +21,33 @@ struct sidtab_node {#define SIDTAB_SIZE SIDTAB_HASH_BUCKETS -struct sidtab { -struct sidtab_node **htable; +struct selinux_sidtab { +struct selinux_sidtab_node **htable;unsigned int nel;/* number of elements */ unsigned int next_sid;/* next SID to allocate */ unsigned char shutdown;spinlock_t lock; }; -int sidtab_init (struct sidtab *s); -int sidtab_insert (struct sidtab *s,u32 sid,struct context *context); -struct context *sidtab_search (struct sidtab *s,u32 sid); -struct context *sidtab_search_force (struct sidtab *s,u32 sid); +int selinux_sidtab_init (struct selinux_sidtab *s); +int selinux_sidtab_insert (struct selinux_sidtab *s,u32 sid,struct selinux_context *context); +struct selinux_context *selinux_sidtab_search (struct selinux_sidtab *s,u32 sid); +struct selinux_context *selinux_sidtab_search_force (struct selinux_sidtab *s,u32 sid); -int sidtab_map (struct sidtab *s, +int selinux_sidtab_map (struct selinux_sidtab *s,int (*apply) (u32 sid, -struct context *context, +struct selinux_context *context,void *args),void *args); -int sidtab_context_to_sid (struct sidtab *s, -struct context *context, +int selinux_sidtab_context_to_sid (struct selinux_sidtab *s, +struct selinux_context *context,u32 *sid); -void sidtab_hash_eval (struct sidtab *h,char *tag); -void sidtab_destroy (struct sidtab *s); -void sidtab_set (struct sidtab *dst,struct sidtab *src); -void sidtab_shutdown (struct sidtab *s); +void selinux_sidtab_hash_eval (struct selinux_sidtab *h,char *tag); +void selinux_sidtab_destroy (struct selinux_sidtab *s); +void selinux_sidtab_set (struct selinux_sidtab *dst,struct selinux_sidtab *src); +void selinux_sidtab_shutdown (struct selinux_sidtab *s);#endif /* _SS_SIDTAB_H_ */
security/selinux/ss/symtab.c +1 -1
@@ -33,7 +33,7 @@ static int symcmp(struct selinux_hashtab *h, const void *key1, const void *key2) } -int symtab_init (struct symtab *s,unsigned int size) +int selinux_symtab_init (struct selinux_symtab *s,unsigned int size) { s->table =selinux_hashtab_create (symhash, symcmp, size);if (!s->table)
security/selinux/ss/symtab.h +2 -2
@@ -11,12 +11,12 @@#include "hashtab.h" -struct symtab { +struct selinux_symtab {struct selinux_hashtab *table;/* hash table (keyed on a string) */ u32 nprim;/* number of primary names in table */ }; -int symtab_init (struct symtab *s,unsigned int size); +int selinux_symtab_init (struct selinux_symtab *s,unsigned int size);#endif /* _SS_SYMTAB_H_ */
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.