diff options
| author | James Morris <jmorris@namei.org> | 2011-08-30 12:52:32 +1000 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-09-09 16:56:32 -0700 |
| commit | 7b98a5857c3fa86cb0a7e5f893643491a8b5b425 (patch) | |
| tree | 9e8b83d35a9c70f2c02853de808184871df3aba9 /security/selinux/ss | |
| parent | 0ff53f5ddbaebeac1c2735125901275acc1fecc6 (diff) | |
| download | linux-7b98a5857c3fa86cb0a7e5f893643491a8b5b425.tar.gz linux-7b98a5857c3fa86cb0a7e5f893643491a8b5b425.tar.bz2 linux-7b98a5857c3fa86cb0a7e5f893643491a8b5b425.zip | |
selinux: sparse fix: fix several warnings in the security server code
Fix several sparse warnings in the SELinux security server code.
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/selinux/ss')
| -rw-r--r-- | security/selinux/ss/conditional.c | 2 | ||||
| -rw-r--r-- | security/selinux/ss/conditional.h | 1 | ||||
| -rw-r--r-- | security/selinux/ss/policydb.c | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/security/selinux/ss/conditional.c b/security/selinux/ss/conditional.c index a53373207fb4..2ec904177fe0 100644 --- a/security/selinux/ss/conditional.c +++ b/security/selinux/ss/conditional.c @@ -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; diff --git a/security/selinux/ss/conditional.h b/security/selinux/ss/conditional.h index 3f209c635295..4d1f87466508 100644 --- a/security/selinux/ss/conditional.h +++ b/security/selinux/ss/conditional.h @@ -13,6 +13,7 @@ #include "avtab.h" #include "symtab.h" #include "policydb.h" +#include "../include/conditional.h" #define COND_EXPR_MAXDEPTH 10 diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c index 2381d0ded228..a7f61d52f05c 100644 --- a/security/selinux/ss/policydb.c +++ b/security/selinux/ss/policydb.c @@ -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; |