Commit aec00aa0 authored by Colin Ian King's avatar Colin Ian King Committed by Jarkko Sakkinen
Browse files

KEYS: trusted: Fix missing null return from kzalloc call 



The kzalloc call can return null with the GFP_KERNEL flag so
add a null check and exit via a new error exit label. Use the
same exit error label for another error path too.

Addresses-Coverity: ("Dereference null return value")
Fixes: 830027e2cb55 ("KEYS: trusted: Add generic trusted keys framework")
Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
Reviewed-by: default avatarSumit Garg <sumit.garg@linaro.org>
Reviewed-by: default avatarJarkko Sakkinen <jarkko@kernel.org>
Signed-off-by: default avatarJarkko Sakkinen <jarkko@kernel.org>
parent 3d785d73

security/keys/trusted-keys/trusted_core.c

+4 −2
Original line number Diff line number Diff line
@@ -116,11 +116,13 @@ static struct trusted_key_payload *trusted_payload_alloc(struct key *key) 


	ret = key_payload_reserve(key, sizeof(*p));

	if (ret < 0)

		return p;

		goto err;

	p = kzalloc(sizeof(*p), GFP_KERNEL);

	if (!p)

		goto err;



	p->migratable = migratable;



err:

	return p;

}