Commit d6f7aa27 authored by James Morris's avatar James Morris

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

parents 9fc2b4b4 54302094
...@@ -2253,8 +2253,8 @@ static const struct file_operations smk_access2_ops = { ...@@ -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, ...@@ -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, ...@@ -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;
} }
......
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