OSDN Git Service

KEYS: put keyring if install_session_keyring_to_cred() fails
authorEric Biggers <ebiggers@google.com>
Thu, 8 Jun 2017 13:48:03 +0000 (14:48 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 10 Nov 2018 15:41:34 +0000 (07:41 -0800)
commit9aae17f851e2828de33fa4330cf519397c9aa2bf
treee1564a4ff657628a1d0c653c9b80323f879dbc7a
parent6596d0ab8c602b6bb9f4a8423ddd7fc3acb2418f
KEYS: put keyring if install_session_keyring_to_cred() fails

[ Upstream commit d636bd9f12a66ea3775c9fabbf3f8e118253467a ]

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 23567fd052a9 ("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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
security/keys/process_keys.c