Smack: prevent revoke-subject from failing when unseen label is written to it
authorRafal Krypa <r.krypa@samsung.com>
Tue, 27 Nov 2012 15:28:11 +0000 (16:28 +0100)
committerHeikki Krogerus <heikki.krogerus@linux.intel.com>
Mon, 27 May 2013 08:25:17 +0000 (11:25 +0300)
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

(Upstream commit id: d15d9fad16f6aa459cf4926a1d3aba36b004e9a2)

Signed-off-by: Rafal Krypa <r.krypa@samsung.com>
Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
security/smack/smackfs.c

index 76a5dca..337e32c 100644 (file)
@@ -2035,10 +2035,8 @@ static ssize_t smk_write_revoke_subj(struct file *file, const char __user *buf,
        }
 
        skp = smk_find_entry(cp);
-       if (skp == NULL) {
-               rc = -EINVAL;
+       if (skp == NULL)
                goto free_out;
-       }
 
        rule_list = &skp->smk_rules;
        rule_lock = &skp->smk_rules_lock;