diff options
| author | James Morris <jmorris@namei.org> | 2009-01-06 17:58:22 -0500 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-01-06 17:58:22 -0500 |
| commit | ac8cc0fa5395fe2278e305a4cbed48e90d88d878 (patch) | |
| tree | 515f577bfddd054ee4373228be7c974dfb8133af /security/keys/keyctl.c | |
| parent | 238c6d54830c624f34ac9cf123ac04aebfca5013 (diff) | |
| parent | 3699c53c485bf0168e6500d0ed18bf931584dd7c (diff) | |
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, | |||
| 1294 | 1294 | ||
| 1295 | case KEYCTL_GET_SECURITY: | 1295 | case KEYCTL_GET_SECURITY: |
| 1296 | return keyctl_get_security((key_serial_t) arg2, | 1296 | return keyctl_get_security((key_serial_t) arg2, |
| 1297 | (char *) arg3, | 1297 | (char __user *) arg3, |
| 1298 | (size_t) arg4); | 1298 | (size_t) arg4); |
| 1299 | 1299 | ||
| 1300 | default: | 1300 | default: |