diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-28 14:18:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-28 14:18:10 -0700 |
| commit | d4ec1f181f962f1cce3a61928d16e439e83882d1 (patch) | |
| tree | b7c9ece891d364ee1f9fa08839de23096f903182 | |
| parent | d61be4b3f2684b6d76ef8c1d28ecdeb9bb20fa8f (diff) | |
| parent | ca4da5dd1f99fe9c59f1709fb43e818b18ad20e0 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull key fix from James Morris.
Fix memory leak.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
KEYS: ensure we free the assoc array edit if edit is valid
| -rw-r--r-- | security/keys/keyring.c | 8 |
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); |