summaryrefslogtreecommitdiffstats
path: root/security/keys
diff options
context:
space:
mode:
authorColin Ian King <colin.king@canonical.com>2021-04-30 12:37:24 +0100
committerJarkko Sakkinen <jarkko@kernel.org>2021-05-12 22:36:36 +0300
commit83a775d5f9bfda95b1c295f95a3a041a40c7f321 (patch)
tree659ffcc6d800f6949fcc400e7a718ff86fba05fb /security/keys
parentdbb5afad100a828c97e012c6106566d99f041db6 (diff)
downloadlinux-stable-83a775d5f9bfda95b1c295f95a3a041a40c7f321.tar.gz
linux-stable-83a775d5f9bfda95b1c295f95a3a041a40c7f321.tar.bz2
linux-stable-83a775d5f9bfda95b1c295f95a3a041a40c7f321.zip
KEYS: trusted: Fix memory leak on object td
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: 5df16caada3f ("KEYS: trusted: Fix incorrect handling of tpm_get_random()") Signed-off-by: Colin Ian King <colin.king@canonical.com> Reviewed-by: Nick Desaulniers <ndesaulniers@google.com> Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org> Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
Diffstat (limited to 'security/keys')
-rw-r--r--security/keys/trusted-keys/trusted_tpm1.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/security/keys/trusted-keys/trusted_tpm1.c b/security/keys/trusted-keys/trusted_tpm1.c
index 469394550801..aa108bea6739 100644
--- a/security/keys/trusted-keys/trusted_tpm1.c
+++ b/security/keys/trusted-keys/trusted_tpm1.c
@@ -493,10 +493,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);