linux/security/keys/keyring.c
Colin Ian King 66db51c9f7 KEYS: ensure we free the assoc array edit if edit is valid
[ Upstream commit HEAD ]

commit ca4da5dd1f upstream.

__key_link_end is not freeing the associated array edit structure
and this leads to a 512 byte memory leak each time an identical
existing key is added with add_key().

The reason the add_key() system call returns okay is that
key_create_or_update() calls __key_link_begin() before checking to see
whether it can update a key directly rather than adding/replacing - which
it turns out it can.  Thus __key_link() is not called through
__key_instantiate_and_link() and __key_link_end() must cancel the edit.

CVE-2015-1333

Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: James Morris <james.l.morris@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

(cherry picked from commit c9cd9b18da)
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
2015-08-04 14:28:38 -04:00

1396 lines
37 KiB