aboutsummaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorRafal Krypa <r.krypa@samsung.com>2012-11-27 10:28:11 -0500
committerCasey Schaufler <casey@schaufler-ca.com>2013-03-19 17:15:21 -0400
commitd15d9fad16f6aa459cf4926a1d3aba36b004e9a2 (patch)
tree69d8cb3fa6f0fd12b34d1722a4113740e3bbf9f8 /security
parent921f3ac4c3f2fd46ae99195a1168383ca9b41ed1 (diff)
Smack: prevent revoke-subject from failing when unseen label is written to it
Special file /smack/revoke-subject will silently accept labels that are not present on the subject label list. Nothing has to be done for such labels, as there are no rules for them to revoke. Targeted for git://git.gitorious.org/smack-next/kernel.git Signed-off-by: Rafal Krypa <r.krypa@samsung.com>
Diffstat (limited to 'security')
-rw-r--r--security/smack/smackfs.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/security/smack/smackfs.c b/security/smack/smackfs.c
index 76a5dca46404..337e32c551da 100644
--- a/security/smack/smackfs.c
+++ b/security/smack/smackfs.c
@@ -2035,10 +2035,8 @@ static ssize_t smk_write_revoke_subj(struct file *file, const char __user *buf,
2035 } 2035 }
2036 2036
2037 skp = smk_find_entry(cp); 2037 skp = smk_find_entry(cp);
2038 if (skp == NULL) { 2038 if (skp == NULL)
2039 rc = -EINVAL;
2040 goto free_out; 2039 goto free_out;
2041 }
2042 2040
2043 rule_list = &skp->smk_rules; 2041 rule_list = &skp->smk_rules;
2044 rule_lock = &skp->smk_rules_lock; 2042 rule_lock = &skp->smk_rules_lock;