KEYS: ensure we free the assoc array edit if edit is valid 96/118096/2
authorColin Ian King <colin.king@canonical.com>
Mon, 27 Jul 2015 14:23:43 +0000 (15:23 +0100)
committerSeung-Woo Kim <sw0312.kim@samsung.com>
Thu, 9 Mar 2017 00:25:35 +0000 (16:25 -0800)
commiteb8bcaf5ff2f38ef2838e02f4397f16b5ed7b240
treec1fbda0d623e0c3fc3604efa2e907e837c8d11d1
parent90821df77f42b652213ce23a2c54ae480508b60e
KEYS: ensure we free the assoc array edit if edit is valid

[ Upstream commit HEAD ]

commit ca4da5dd1f99fe9c59f1709fb43e818b18ad20e0 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 c9cd9b18dac801040ada16562dc579d5ac366d75)
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
[mainline backport of commit 66db51c9f7b2fe7ebdfa753b2aa9abbb9feddc87]
Change-Id: I00cf148142abfc956609aeb35b030b4d1bba16e6
Signed-off-by: Jaechul Lee <jcsing.lee@samsung.com>
security/keys/keyring.c