Merge branch 'next' into for-linus
commit
54d2f649a6
|
@ -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
|
* the subject/object pair and replaces the access that was
|
||||||
* there. If the pair isn't found add it with the specified
|
* there. If the pair isn't found add it with the specified
|
||||||
* access.
|
* 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 *sp;
|
||||||
struct smk_list_entry *newp;
|
struct smk_list_entry *newp;
|
||||||
|
int ret = 0;
|
||||||
|
|
||||||
mutex_lock(&smack_list_lock);
|
mutex_lock(&smack_list_lock);
|
||||||
|
|
||||||
|
@ -202,14 +206,20 @@ static void smk_set_access(struct smack_rule *srp)
|
||||||
|
|
||||||
if (sp == NULL) {
|
if (sp == NULL) {
|
||||||
newp = kzalloc(sizeof(struct smk_list_entry), GFP_KERNEL);
|
newp = kzalloc(sizeof(struct smk_list_entry), GFP_KERNEL);
|
||||||
|
if (newp == NULL) {
|
||||||
|
ret = -ENOMEM;
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
|
|
||||||
newp->smk_rule = *srp;
|
newp->smk_rule = *srp;
|
||||||
newp->smk_next = smack_list;
|
newp->smk_next = smack_list;
|
||||||
smack_list = newp;
|
smack_list = newp;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
out:
|
||||||
mutex_unlock(&smack_list_lock);
|
mutex_unlock(&smack_list_lock);
|
||||||
|
|
||||||
return;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -309,8 +319,10 @@ static ssize_t smk_write_load(struct file *file, const char __user *buf,
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
smk_set_access(&rule);
|
rc = smk_set_access(&rule);
|
||||||
rc = count;
|
|
||||||
|
if (!rc)
|
||||||
|
rc = count;
|
||||||
|
|
||||||
out:
|
out:
|
||||||
kfree(data);
|
kfree(data);
|
||||||
|
|
Loading…
Reference in New Issue