korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-15 06:55:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

KEYS: trusted: Fix memory leak in tpm2_key_encode()

Browse Source 
commit ffcaa2172c upstream.

'scratch' is never freed. Fix this by calling kfree() in the success, and
in the error case.

Cc: stable@vger.kernel.org # +v5.13
Fixes: f221974525 ("security: keys: trusted: use ASN.1 TPM2 key format for the blobs")
Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jarkko Sakkinen 2024-05-20 02:31:53 +03:00 committed by Greg Kroah-Hartman
parent ad3f7986c5
commit e62835264d
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
security/keys/trusted-keys/trusted_tpm2.c
View File

@ -38,6 +38,7 @@ static int tpm2_key_encode(struct trusted_key_payload *payload,
u8 *end_work = scratch + SCRATCH_SIZE; u8 *end_work = scratch + SCRATCH_SIZE;
u8 *priv, *pub; u8 *priv, *pub;
u16 priv_len, pub_len; u16 priv_len, pub_len;
int ret;
priv_len = get_unaligned_be16(src) + 2; priv_len = get_unaligned_be16(src) + 2;
priv = src; priv = src;
@ -57,8 +58,10 @@ static int tpm2_key_encode(struct trusted_key_payload *payload,
unsigned char bool[3], *w = bool; unsigned char bool[3], *w = bool;
/* tag 0 is emptyAuth */ /* tag 0 is emptyAuth */
w = asn1_encode_boolean(w, w + sizeof(bool), true); w = asn1_encode_boolean(w, w + sizeof(bool), true);
if (WARN(IS_ERR(w), "BUG: Boolean failed to encode")) if (WARN(IS_ERR(w), "BUG: Boolean failed to encode")) {
return PTR_ERR(w); ret = PTR_ERR(w);
goto err;
}
work = asn1_encode_tag(work, end_work, 0, bool, w - bool); work = asn1_encode_tag(work, end_work, 0, bool, w - bool);
} }
@ -69,8 +72,10 @@ static int tpm2_key_encode(struct trusted_key_payload *payload,
* trigger, so if it does there's something nefarious going on * trigger, so if it does there's something nefarious going on
*/ */
if (WARN(work - scratch + pub_len + priv_len + 14 > SCRATCH_SIZE, if (WARN(work - scratch + pub_len + priv_len + 14 > SCRATCH_SIZE,
"BUG: scratch buffer is too small")) "BUG: scratch buffer is too small")) {
return -EINVAL; ret = -EINVAL;
goto err;
}
work = asn1_encode_integer(work, end_work, options->keyhandle); work = asn1_encode_integer(work, end_work, options->keyhandle);
work = asn1_encode_octet_string(work, end_work, pub, pub_len); work = asn1_encode_octet_string(work, end_work, pub, pub_len);
@ -79,10 +84,17 @@ static int tpm2_key_encode(struct trusted_key_payload *payload,
work1 = payload->blob; work1 = payload->blob;
work1 = asn1_encode_sequence(work1, work1 + sizeof(payload->blob), work1 = asn1_encode_sequence(work1, work1 + sizeof(payload->blob),
scratch, work - scratch); scratch, work - scratch);
if (WARN(IS_ERR(work1), "BUG: ASN.1 encoder failed")) if (WARN(IS_ERR(work1), "BUG: ASN.1 encoder failed")) {
return PTR_ERR(work1); ret = PTR_ERR(work1);
goto err;
}
kfree(scratch);
return work1 - payload->blob; return work1 - payload->blob;
err:
kfree(scratch);
return ret;
} }
struct tpm2_key_context { struct tpm2_key_context {