diff options
author | David S. Miller <davem@davemloft.net> | 2009-02-03 09:15:35 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-02-03 09:15:35 +0100 |
commit | b3ff29d2ccfe3af065a9b393699a8fbf2abd1b15 (patch) | |
tree | 99e5b423473097756353d038f922b2623f3edd2a /security/smack | |
parent | tun: Check supplemental groups in TUN/TAP driver. (diff) | |
parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds... (diff) | |
download | linux-b3ff29d2ccfe3af065a9b393699a8fbf2abd1b15.tar.xz linux-b3ff29d2ccfe3af065a9b393699a8fbf2abd1b15.zip |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/Kconfig
Diffstat (limited to 'security/smack')
-rw-r--r-- | security/smack/smackfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/smack/smackfs.c b/security/smack/smackfs.c index 71e2b914363e..8e42800878f4 100644 --- a/security/smack/smackfs.c +++ b/security/smack/smackfs.c @@ -334,7 +334,7 @@ static ssize_t smk_write_load(struct file *file, const char __user *buf, break; case 'a': case 'A': - rule.smk_access |= MAY_READ; + rule.smk_access |= MAY_APPEND; break; default: goto out; |