]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commit
KEYS: fix keyctl_set_reqkey_keyring() to not leak thread keyrings
authorEric Biggers <ebiggers@google.com>
Tue, 18 Apr 2017 14:31:09 +0000 (15:31 +0100)
committerThadeu Lima de Souza Cascardo <cascardo@canonical.com>
Wed, 17 May 2017 16:38:06 +0000 (13:38 -0300)
commit4a09908e6b2e279e112b791b3cbddf366fb06668
treec1bd52ac942c62eaf407a8f4cb9bce73113957e4
parent0a308a2c57dd033ac5d704246b0710a422b54d5c
KEYS: fix keyctl_set_reqkey_keyring() to not leak thread keyrings

BugLink: http://bugs.launchpad.net/bugs/1688485
commit c9f838d104fed6f2f61d68164712e3204bf5271b upstream.

This fixes CVE-2017-7472.

Running the following program as an unprivileged user exhausts kernel
memory by leaking thread keyrings:

#include <keyutils.h>

int main()
{
for (;;)
keyctl_set_reqkey_keyring(KEY_REQKEY_DEFL_THREAD_KEYRING);
}

Fix it by only creating a new thread keyring if there wasn't one before.
To make things more consistent, make install_thread_keyring_to_cred()
and install_process_keyring_to_cred() both return 0 if the corresponding
keyring is already present.

Fixes: d84f4f992cbd ("CRED: Inaugurate COW credentials")
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
security/keys/keyctl.c
security/keys/process_keys.c