iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KEYS: put keyring if install_session_keyring_to_cred() fails

Browse Source 
In join_session_keyring(), if install_session_keyring_to_cred() were to
fail, we would leak the keyring reference, just like in the bug fixed by
commit 23567fd052 ("KEYS: Fix keyring ref leak in
join_session_keyring()").  Fortunately this cannot happen currently, but
we really should be more careful.  Do this by adding and using a new
error label at which the keyring reference is dropped.

Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: James Morris <james.l.morris@oracle.com>
This commit is contained in:
Eric Biggers
2017-06-08 14:48:03 +01:00
committed by James Morris
parent 41f1c53e0d
commit d636bd9f12
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
security/keys/process_keys.c
View File

@@ -809,15 +809,14 @@ long join_session_keyring(const char *name)
ret = PTR_ERR(keyring); ret = PTR_ERR(keyring);
goto error2; goto error2;
} else if (keyring == new->session_keyring) { } else if (keyring == new->session_keyring) {
key_put(keyring);
ret = 0; ret = 0;
goto error2; goto error3;
} }
/* we've got a keyring - now to install it */ /* we've got a keyring - now to install it */
ret = install_session_keyring_to_cred(new, keyring); ret = install_session_keyring_to_cred(new, keyring);
if (ret < 0) if (ret < 0)
goto error2; goto error3;
commit_creds(new); commit_creds(new);
mutex_unlock(&key_session_mutex); mutex_unlock(&key_session_mutex);
@@ -827,6 +826,8 @@ long join_session_keyring(const char *name)
okay: okay:
return ret; return ret;
error3:
key_put(keyring);
error2: error2:
mutex_unlock(&key_session_mutex); mutex_unlock(&key_session_mutex);
error: error: