Commit 57070c85 authored by Eric Biggers's avatar Eric Biggers Committed by James Morris
Browse files

KEYS: sanitize add_key() and keyctl() key payloads 



Before returning from add_key() or one of the keyctl() commands that
takes in a key payload, zero the temporary buffer that was allocated to
hold the key payload copied from userspace.  This may contain sensitive
key material that should not be kept around in the slab caches.

Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarJames Morris <james.l.morris@oracle.com>
parent 63a0b050

security/keys/keyctl.c

+9 −3
Original line number Diff line number Diff line
@@ -132,7 +132,10 @@ SYSCALL_DEFINE5(add_key, const char __user *, _type, 


	key_ref_put(keyring_ref);

 error3:

	if (payload) {

		memzero_explicit(payload, plen);

		kvfree(payload);

	}

 error2:

	kfree(description);

 error:
@@ -347,7 +350,7 @@ long keyctl_update_key(key_serial_t id, 


	key_ref_put(key_ref);

error2:

	kfree(payload);

	kzfree(payload);

error:

	return ret;

}
@@ -1093,7 +1096,10 @@ long keyctl_instantiate_key_common(key_serial_t id, 
		keyctl_change_reqkey_auth(NULL);



error2:

	if (payload) {

		memzero_explicit(payload, plen);

		kvfree(payload);

	}

error:

	return ret;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE