Skip to contentSkip to conversation

Make keyctl(KEYCTL_JOIN_SESSION_KEYRING) use the correct arg

PATCH New David Howells 1 participant 1 message Feb 25, 2005 1 message not in the archive

Subsystems (2)
lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

David Howells

author maintainer
#1 lore raw

PATCH 1/1 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 <[email protected]> for spotting this.

---
warthog>diffstat -p1 keys-joinsess-2611rc4.diff

 security/keys/compat.c |    2 +-
 security/keys/keyctl.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
security/keys/compat.c +1 -1
diff -uNr linux-2.6.11-rc4/security/keys/compat.c linux-2.6.11-rc4-keys-task/security/keys/compat.c
@@ -31,7 +31,7 @@
 		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);
security/keys/keyctl.c +1 -1
diff -uNr linux-2.6.11-rc4/security/keys/keyctl.c linux-2.6.11-rc4-keys-task/security/keys/keyctl.c
@@ -923,7 +923,7 @@
 					     (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,