Skip to content

Commit

Permalink
selinux: propagate error codes in cond_read_list()
Browse files Browse the repository at this point in the history
These are passed back when the security module gets loaded.

The original code always returned -1 (-EPERM) on error but after this
patch it can return -EINVAL, or -ENOMEM or propagate the error code from
cond_read_node().  cond_read_node() still returns -1 all the time, but I
fix that in a later patch.

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>
  • Loading branch information
Dan Carpenter authored and James Morris committed Aug 2, 2010
1 parent 9e0bd4c commit 5241c10
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions security/selinux/ss/conditional.c
Original file line number Diff line number Diff line change
Expand Up @@ -445,8 +445,8 @@ int cond_read_list(struct policydb *p, void *fp)
int rc;

rc = next_entry(buf, fp, sizeof buf);
if (rc < 0)
return -1;
if (rc)
return rc;

len = le32_to_cpu(buf[0]);

Expand All @@ -455,11 +455,13 @@ int cond_read_list(struct policydb *p, void *fp)
goto err;

for (i = 0; i < len; i++) {
rc = -ENOMEM;
node = kzalloc(sizeof(struct cond_node), GFP_KERNEL);
if (!node)
goto err;

if (cond_read_node(p, node, fp) != 0)
rc = cond_read_node(p, node, fp);
if (rc)
goto err;

if (i == 0)
Expand All @@ -472,7 +474,7 @@ int cond_read_list(struct policydb *p, void *fp)
err:
cond_list_destroy(p->cond_list);
p->cond_list = NULL;
return -1;
return rc;
}

/* Determine whether additional permissions are granted by the conditional
Expand Down

0 comments on commit 5241c10

Please sign in to comment.