diff options
| author |   Rafal Krypa <r.krypa@samsung.com> | 2012-11-27 16:28:11 +0100 |
|---|---|---|
| committer |   Casey Schaufler <casey@schaufler-ca.com> | 2013-03-19 14:15:21 -0700 |
| commit | d15d9fad16f6aa459cf4926a1d3aba36b004e9a2 (patch) | |
| tree | 69d8cb3fa6f0fd12b34d1722a4113740e3bbf9f8 /security/smack/smackfs.c | |
| parent | tomoyo: use DEFINE_SRCU() to define tomoyo_ss (diff) | |
| download | linux-dev-d15d9fad16f6aa459cf4926a1d3aba36b004e9a2.tar.xz linux-dev-d15d9fad16f6aa459cf4926a1d3aba36b004e9a2.zip | |
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/smack/smackfs.c')
| -rw-r--r-- | security/smack/smackfs.c | 4 |
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, } 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; |