summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorColin Ian King <colin.king@canonical.com>2015-07-27 15:23:43 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-08-03 09:29:11 -0700
commit4fd5dc9eece297f49f16f82422ead3a28b11ea70 (patch)
treeba1500bf7301aa543cfad53264bd5494b25a8ccb /security
parente47f1631376e53715e14a0d1e25421f3868f90b1 (diff)
downloadlwn-4fd5dc9eece297f49f16f82422ead3a28b11ea70.tar.gz
lwn-4fd5dc9eece297f49f16f82422ead3a28b11ea70.zip
KEYS: ensure we free the assoc array edit if edit is valid
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>
Diffstat (limited to 'security')
-rw-r--r--security/keys/keyring.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/security/keys/keyring.c b/security/keys/keyring.c
index e72548b5897e..d33437007ad2 100644
--- a/security/keys/keyring.c
+++ b/security/keys/keyring.c
@@ -1181,9 +1181,11 @@ void __key_link_end(struct key *keyring,
if (index_key->type == &key_type_keyring)
up_write(&keyring_serialise_link_sem);
- if (edit && !edit->dead_leaf) {
- key_payload_reserve(keyring,
- keyring->datalen - KEYQUOTA_LINK_BYTES);
+ if (edit) {
+ if (!edit->dead_leaf) {
+ key_payload_reserve(keyring,
+ keyring->datalen - KEYQUOTA_LINK_BYTES);
+ }
assoc_array_cancel_edit(edit);
}
up_write(&keyring->sem);