diff options
| author | James Morris <jmorris@namei.org> | 2009-01-06 23:58:22 +0100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-01-06 23:58:22 +0100 |
| commit | ac8cc0fa5395fe2278e305a4cbed48e90d88d878 (patch) | |
| tree | 515f577bfddd054ee4373228be7c974dfb8133af /security/keys/keyctl.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm (diff) | |
| parent | CRED: Fix regression in cap_capable() as shown up by sys_faccessat() [ver #3] (diff) | |
| download | linux-ac8cc0fa5395fe2278e305a4cbed48e90d88d878.tar.xz linux-ac8cc0fa5395fe2278e305a4cbed48e90d88d878.zip | |
Merge branch 'next' into for-linus
Diffstat (limited to 'security/keys/keyctl.c')
| -rw-r--r-- | security/keys/keyctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c index 6688765bd8b9..09796797d122 100644 --- a/security/keys/keyctl.c +++ b/security/keys/keyctl.c @@ -1294,7 +1294,7 @@ asmlinkage long sys_keyctl(int option, unsigned long arg2, unsigned long arg3, case KEYCTL_GET_SECURITY: return keyctl_get_security((key_serial_t) arg2, - (char *) arg3, + (char __user *) arg3, (size_t) arg4); default: |