2021-04-30 18:59:25

by Tom Rix

Subject: [PATCH] KEYS: trusted: fix memory leak

From: Tom Rix <[email protected]>

Static analysis reports this problem
trusted-keys/trusted_tpm1.c:496:10: warning: Potential memory leak
return ret;
^~~

In tpm_seal() some failure handling returns directly, without
freeing memory.

Fixes: 5df16caada3f ("KEYS: trusted: Fix incorrect handling of tpm_get_random()")
Signed-off-by: Tom Rix <[email protected]>
---
security/keys/trusted-keys/trusted_tpm1.c | 8 +++++---
1 file 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);
--
2.26.3

2021-04-30 19:57:14

by Ben Boeckel

Subject: Re: [PATCH] KEYS: trusted: fix memory leak

On Fri, Apr 30, 2021 at 11:58:10 -0700, [email protected] wrote:
> From: Tom Rix <[email protected]>
>
> Static analysis reports this problem
> trusted-keys/trusted_tpm1.c:496:10: warning: Potential memory leak
> return ret;
> ^~~
>
> In tpm_seal() some failure handling returns directly, without
> freeing memory.
>
> Fixes: 5df16caada3f ("KEYS: trusted: Fix incorrect handling of tpm_get_random()")
> Signed-off-by: Tom Rix <[email protected]>
> ---
> security/keys/trusted-keys/trusted_tpm1.c | 8 +++++---
> 1 file 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);

I see this patch also submitted by Colin (Cc'd) in Message-Id:

<[email protected]>

To my eyes, the commit message seems a bit better over there.

--Ben

2021-04-30 23:09:48

by Tom Rix

Subject: Re: [PATCH] KEYS: trusted: fix memory leak

On 4/30/21 12:50 PM, Ben Boeckel wrote:
> On Fri, Apr 30, 2021 at 11:58:10 -0700, [email protected] wrote:
>> From: Tom Rix <[email protected]>
>>
>> Static analysis reports this problem
>> trusted-keys/trusted_tpm1.c:496:10: warning: Potential memory leak
>> return ret;
>> ^~~
>>
>> In tpm_seal() some failure handling returns directly, without
>> freeing memory.
>>
>> Fixes: 5df16caada3f ("KEYS: trusted: Fix incorrect handling of tpm_get_random()")
>> Signed-off-by: Tom Rix <[email protected]>
>> ---
>> security/keys/trusted-keys/trusted_tpm1.c | 8 +++++---
>> 1 file 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);
> I see this patch also submitted by Colin (Cc'd) in Message-Id:
>
> <[email protected]>

Let's use Colin's.

Tom

>
> To my eyes, the commit message seems a bit better over there.
>
> --Ben
>

2021-05-03 18:11:39

by Jarkko Sakkinen

Subject: Re: [PATCH] KEYS: trusted: fix memory leak

On Fri, Apr 30, 2021 at 11:58:10AM -0700, [email protected] wrote:
> From: Tom Rix <[email protected]>
>
> Static analysis reports this problem
> trusted-keys/trusted_tpm1.c:496:10: warning: Potential memory leak
> return ret;
> ^~~
>
> In tpm_seal() some failure handling returns directly, without
> freeing memory.
>
> Fixes: 5df16caada3f ("KEYS: trusted: Fix incorrect handling of tpm_get_random()")
> Signed-off-by: Tom Rix <[email protected]>

Hi, thanks appreciate this but unfortunately applied Colin's fix already
:-/

/Jarkko