OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'smack-for-4.2-stacked' of https://github.com/cschaufler/smack-next into next

This commit is contained in:
James Morris 2015-06-13 09:51:16 +10:00
parent 9fc2b4b436 5430209497
commit d6f7aa27f4
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
security/smack/smackfs.c
View File

@ -2253,8 +2253,8 @@ static const struct file_operations smk_access2_ops = {
static ssize_t smk_write_revoke_subj(struct file *file, const char __user *buf, static ssize_t smk_write_revoke_subj(struct file *file, const char __user *buf,
size_t count, loff_t *ppos) size_t count, loff_t *ppos)
{ {
char *data = NULL; char *data;
const char *cp = NULL; const char *cp;
struct smack_known *skp; struct smack_known *skp;
struct smack_rule *sp; struct smack_rule *sp;
struct list_head *rule_list; struct list_head *rule_list;
@ -2276,18 +2276,18 @@ static ssize_t smk_write_revoke_subj(struct file *file, const char __user *buf,
if (copy_from_user(data, buf, count) != 0) { if (copy_from_user(data, buf, count) != 0) {
rc = -EFAULT; rc = -EFAULT;
goto free_out; goto out_data;
} }
cp = smk_parse_smack(data, count); cp = smk_parse_smack(data, count);
if (IS_ERR(cp)) { if (IS_ERR(cp)) {
rc = PTR_ERR(cp); rc = PTR_ERR(cp);
goto free_out; goto out_data;
} }
skp = smk_find_entry(cp); skp = smk_find_entry(cp);
if (skp == NULL) if (skp == NULL)
goto free_out; goto out_cp;
rule_list = &skp->smk_rules; rule_list = &skp->smk_rules;
rule_lock = &skp->smk_rules_lock; rule_lock = &skp->smk_rules_lock;
@ -2299,9 +2299,11 @@ static ssize_t smk_write_revoke_subj(struct file *file, const char __user *buf,
mutex_unlock(rule_lock); mutex_unlock(rule_lock);
free_out: out_cp:
kfree(data);
kfree(cp); kfree(cp);
out_data:
kfree(data);
return rc; return rc;
} }