diff options
| author | David Howells <dhowells@redhat.com> | 2005-02-24 22:17:30 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-02-24 22:17:30 -0800 |
| commit | 9dffa35e55fccdac191d2c774454b41394b25a2c (patch) | |
| tree | a7f2fc60912d4932e0ff59dedce9f5d80bdd76a4 /security | |
| parent | 16d5c084844ab86e74896bdfaa296f2c37a3c073 (diff) | |
[PATCH] Make keyctl(KEYCTL_JOIN_SESSION_KEYRING) use the correct arg
The attached patch makes keyctl() use the correct argument when invoking
the KEYCTL_JOIN_SESSION_KEYRING function.
I'm not sure how this evaded testing before, but I suspect the compiler was
kind and made both argument registers hold the same value.
Thanks to Kevin Coffman <kwc@citi.umich.edu> for spotting this.
Signed-Off-By: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'security')
| -rw-r--r-- | security/keys/compat.c | 2 | ||||
| -rw-r--r-- | security/keys/keyctl.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/security/keys/compat.c b/security/keys/compat.c index 17c038c241ea..aff8b22dcb5c 100644 --- a/security/keys/compat.c +++ b/security/keys/compat.c @@ -31,7 +31,7 @@ asmlinkage long compat_sys_keyctl(u32 option, return keyctl_get_keyring_ID(arg2, arg3); case KEYCTL_JOIN_SESSION_KEYRING: - return keyctl_join_session_keyring(compat_ptr(arg3)); + return keyctl_join_session_keyring(compat_ptr(arg2)); case KEYCTL_UPDATE: return keyctl_update_key(arg2, compat_ptr(arg3), arg4); diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c index 4d95fdb75bce..dc0011b3fac9 100644 --- a/security/keys/keyctl.c +++ b/security/keys/keyctl.c @@ -923,7 +923,7 @@ asmlinkage long sys_keyctl(int option, unsigned long arg2, unsigned long arg3, (int) arg3); case KEYCTL_JOIN_SESSION_KEYRING: - return keyctl_join_session_keyring((const char __user *) arg3); + return keyctl_join_session_keyring((const char __user *) arg2); case KEYCTL_UPDATE: return keyctl_update_key((key_serial_t) arg2, |