Commit d4ec1f18 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents d61be4b3 ca4da5dd

security/keys/keyring.c

+5 −3
Original line number Diff line number Diff line
@@ -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) {

	if (edit) {

		if (!edit->dead_leaf) {

			key_payload_reserve(keyring,

				keyring->datalen - KEYQUOTA_LINK_BYTES);

		}

		assoc_array_cancel_edit(edit);

	}

	up_write(&keyring->sem);