Commit d05a788f authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for-linus' of...

Merge branch 'for-linus' of git://

* 'for-linus' of git://
  smackfs: check for allocation failures in smk_set_access()
parents 96faec94 54d2f649
......@@ -185,11 +185,15 @@ static int smk_open_load(struct inode *inode, struct file *file)
* the subject/object pair and replaces the access that was
* there. If the pair isn't found add it with the specified
* access.
* Returns 0 if nothing goes wrong or -ENOMEM if it fails
* during the allocation of the new pair to add.
static void smk_set_access(struct smack_rule *srp)
static int smk_set_access(struct smack_rule *srp)
struct smk_list_entry *sp;
struct smk_list_entry *newp;
int ret = 0;
......@@ -202,14 +206,20 @@ static void smk_set_access(struct smack_rule *srp)
if (sp == NULL) {
newp = kzalloc(sizeof(struct smk_list_entry), GFP_KERNEL);
if (newp == NULL) {
ret = -ENOMEM;
goto out;
newp->smk_rule = *srp;
newp->smk_next = smack_list;
smack_list = newp;
return ret;
......@@ -309,8 +319,10 @@ static ssize_t smk_write_load(struct file *file, const char __user *buf,
goto out;
rc = count;
rc = smk_set_access(&rule);
if (!rc)
rc = count;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment