diff options
author | Eric Miao <eric.miao@marvell.com> | 2009-03-09 09:21:07 -0400 |
---|---|---|
committer | Eric Miao <eric.miao@marvell.com> | 2009-03-09 09:21:07 -0400 |
commit | abcea2c322cef559ef2f108b4763d107a5ccc37f (patch) | |
tree | 5fec7fec372f9bdb70703f6c77bfc49cda945442 /security | |
parent | 8118aea23c328fd4913b325af53fda9d530b1d56 (diff) | |
parent | 6d831c6554e4f95083919914955a1a3a4a6acfa9 (diff) |
Merge branch 'devel' of ssh://master.kernel.org/home/rmk/linux-2.6-arm into devel
Diffstat (limited to 'security')
-rw-r--r-- | security/keys/keyctl.c | 1 | ||||
-rw-r--r-- | security/smack/smackfs.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c index e9335e1c6cf5..b1ec3b4ee17d 100644 --- a/security/keys/keyctl.c +++ b/security/keys/keyctl.c | |||
@@ -270,6 +270,7 @@ long keyctl_join_session_keyring(const char __user *_name) | |||
270 | 270 | ||
271 | /* join the session */ | 271 | /* join the session */ |
272 | ret = join_session_keyring(name); | 272 | ret = join_session_keyring(name); |
273 | kfree(name); | ||
273 | 274 | ||
274 | error: | 275 | error: |
275 | return ret; | 276 | return ret; |
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, | |||
334 | break; | 334 | break; |
335 | case 'a': | 335 | case 'a': |
336 | case 'A': | 336 | case 'A': |
337 | rule.smk_access |= MAY_READ; | 337 | rule.smk_access |= MAY_APPEND; |
338 | break; | 338 | break; |
339 | default: | 339 | default: |
340 | goto out; | 340 | goto out; |