提交 59da819e 编写于 作者: C Colin Ian King 提交者: Zheng Zengkai

KEYS: trusted: Fix memory leak on object td

stable inclusion
from stable-5.10.38
commit 31c9a4b24d86cbb36ff0d7a085725a3b4f0138c8
bugzilla: 51875
CVE: NA

--------------------------------

commit 83a775d5 upstream.

Two error return paths are neglecting to free allocated object td,
causing a memory leak. Fix this by returning via the error return
path that securely kfree's td.

Fixes clang scan-build warning:
security/keys/trusted-keys/trusted_tpm1.c:496:10: warning: Potential
memory leak [unix.Malloc]

Cc: stable@vger.kernel.org
Fixes: 5df16caa ("KEYS: trusted: Fix incorrect handling of tpm_get_random()")
Signed-off-by: NColin Ian King <colin.king@canonical.com>
Reviewed-by: NNick Desaulniers <ndesaulniers@google.com>
Reviewed-by: NJarkko Sakkinen <jarkko@kernel.org>
Signed-off-by: NJarkko Sakkinen <jarkko@kernel.org>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NChen Jun <chenjun102@huawei.com>
Acked-by: NWeilong Chen <chenweilong@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
上级 7243647b
......@@ -500,10 +500,12 @@ static int tpm_seal(struct tpm_buf *tb, uint16_t keytype,
ret = tpm_get_random(chip, td->nonceodd, TPM_NONCE_SIZE);
if (ret < 0)
return ret;
goto out;
if (ret != TPM_NONCE_SIZE)
return -EIO;
if (ret != TPM_NONCE_SIZE) {
ret = -EIO;
goto out;
}
ordinal = htonl(TPM_ORD_SEAL);
datsize = htonl(datalen);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册