UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

selinux: fix error codes in cond_read_av_list() 

After this patch cond_read_av_list() no longer returns -1 for any
errors.  It just propagates error code back from lower levels.  Those can
either be -EINVAL or -ENOMEM.

I also modified cond_insertf() since cond_read_av_list() passes that as a
function pointer to avtab_read_item().  It isn't used anywhere else.

Signed-off-by: Dan Carpenter <error27@gmail.com>
Acked-by:  Stephen D. Smalley <sds@tycho.nsa.gov>
Signed-off-by: James Morris <jmorris@namei.org>
This commit is contained in:
Dan Carpenter 2010-06-12 20:52:19 +02:00 committed by James Morris
parent 5241c1074f
commit 9d623b17a7
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
security/selinux/ss/conditional.c
View File

@ -263,7 +263,7 @@ static int cond_insertf(struct avtab *a, struct avtab_key *k, struct avtab_datum
struct cond_av_list *other = data->other, *list, *cur; struct cond_av_list *other = data->other, *list, *cur;
struct avtab_node *node_ptr; struct avtab_node *node_ptr;
u8 found; u8 found;
int rc = -EINVAL;
/* /*
* For type rules we have to make certain there aren't any * For type rules we have to make certain there aren't any
@ -313,12 +313,15 @@ static int cond_insertf(struct avtab *a, struct avtab_key *k, struct avtab_datum
node_ptr = avtab_insert_nonunique(&p->te_cond_avtab, k, d); node_ptr = avtab_insert_nonunique(&p->te_cond_avtab, k, d);
if (!node_ptr) { if (!node_ptr) {
printk(KERN_ERR "SELinux: could not insert rule.\n"); printk(KERN_ERR "SELinux: could not insert rule.\n");
rc = -ENOMEM;
goto err; goto err;
} }
list = kzalloc(sizeof(struct cond_av_list), GFP_KERNEL); list = kzalloc(sizeof(struct cond_av_list), GFP_KERNEL);
if (!list) if (!list) {
rc = -ENOMEM;
goto err; goto err;
}
list->node = node_ptr; list->node = node_ptr;
if (!data->head) if (!data->head)
@ -331,7 +334,7 @@ static int cond_insertf(struct avtab *a, struct avtab_key *k, struct avtab_datum
err: err:
cond_av_list_destroy(data->head); cond_av_list_destroy(data->head);
data->head = NULL; data->head = NULL;
return -1; return rc;
} }
static int cond_read_av_list(struct policydb *p, void *fp, struct cond_av_list **ret_list, struct cond_av_list *other) static int cond_read_av_list(struct policydb *p, void *fp, struct cond_av_list **ret_list, struct cond_av_list *other)
@ -345,8 +348,8 @@ static int cond_read_av_list(struct policydb *p, void *fp, struct cond_av_list *
len = 0; len = 0;
rc = next_entry(buf, fp, sizeof(u32)); rc = next_entry(buf, fp, sizeof(u32));
if (rc < 0) if (rc)
return -1; return rc;
len = le32_to_cpu(buf[0]); len = le32_to_cpu(buf[0]);
if (len == 0) if (len == 0)
@ -361,7 +364,6 @@ static int cond_read_av_list(struct policydb *p, void *fp, struct cond_av_list *
&data); &data);
if (rc) if (rc)
return rc; return rc;
} }
*ret_list = data.head; *ret_list = data.head;