Browse Source

KEYS: Unlock tasklist when exiting early from keyctl_session_to_parent

When we exit early from keyctl_session_to_parent because of permissions or
because the session keyring is the same as the parent, we need to unlock the
tasklist.

The missing unlock causes the system to hang completely when using
keyctl(KEYCTL_SESSION_TO_PARENT) with a keyring shared with the parent.

Signed-off-by: Marc Dionne <marc.c.dionne@gmail.com>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: James Morris <jmorris@namei.org>
Marc Dionne 15 years ago
parent
commit
5c84342a3e
1 changed files with 1 additions and 0 deletions
  1. 1 0
      security/keys/keyctl.c

+ 1 - 0
security/keys/keyctl.c

@@ -1319,6 +1319,7 @@ long keyctl_session_to_parent(void)
 already_same:
 already_same:
 	ret = 0;
 	ret = 0;
 not_permitted:
 not_permitted:
+	write_unlock_irq(&tasklist_lock);
 	put_cred(cred);
 	put_cred(cred);
 	return ret;
 	return ret;