linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] KEYS: trusted: fix memory leak
@ 2021-04-30 18:58 trix
  2021-04-30 19:50 ` Ben Boeckel
  2021-05-03 14:56 ` Jarkko Sakkinen
  0 siblings, 2 replies; 4+ messages in thread
From: trix @ 2021-04-30 18:58 UTC (permalink / raw)
  To: jejb, jarkko, zohar, dhowells, jmorris, serge
  Cc: linux-integrity, keyrings, linux-security-module, linux-kernel, Tom Rix

From: Tom Rix <trix@redhat.com>

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 <trix@redhat.com>
---
 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


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [PATCH] KEYS: trusted: fix memory leak
  2021-04-30 18:58 [PATCH] KEYS: trusted: fix memory leak trix
@ 2021-04-30 19:50 ` Ben Boeckel
  2021-04-30 23:08   ` Tom Rix
  2021-05-03 14:56 ` Jarkko Sakkinen
  1 sibling, 1 reply; 4+ messages in thread
From: Ben Boeckel @ 2021-04-30 19:50 UTC (permalink / raw)
  To: trix
  Cc: jejb, jarkko, zohar, dhowells, jmorris, serge, linux-integrity,
	keyrings, linux-security-module, linux-kernel, Colin King

On Fri, Apr 30, 2021 at 11:58:10 -0700, trix@redhat.com wrote:
> From: Tom Rix <trix@redhat.com>
> 
> 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 <trix@redhat.com>
> ---
>  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:

    <20210430113724.110746-1-colin.king@canonical.com>

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

--Ben

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH] KEYS: trusted: fix memory leak
  2021-04-30 19:50 ` Ben Boeckel
@ 2021-04-30 23:08   ` Tom Rix
  0 siblings, 0 replies; 4+ messages in thread
From: Tom Rix @ 2021-04-30 23:08 UTC (permalink / raw)
  To: Ben Boeckel
  Cc: jejb, jarkko, zohar, dhowells, jmorris, serge, linux-integrity,
	keyrings, linux-security-module, linux-kernel, Colin King


On 4/30/21 12:50 PM, Ben Boeckel wrote:
> On Fri, Apr 30, 2021 at 11:58:10 -0700, trix@redhat.com wrote:
>> From: Tom Rix <trix@redhat.com>
>>
>> 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 <trix@redhat.com>
>> ---
>>   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:
>
>      <20210430113724.110746-1-colin.king@canonical.com>

Let's use Colin's.

Tom

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


^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH] KEYS: trusted: fix memory leak
  2021-04-30 18:58 [PATCH] KEYS: trusted: fix memory leak trix
  2021-04-30 19:50 ` Ben Boeckel
@ 2021-05-03 14:56 ` Jarkko Sakkinen
  1 sibling, 0 replies; 4+ messages in thread
From: Jarkko Sakkinen @ 2021-05-03 14:56 UTC (permalink / raw)
  To: trix
  Cc: jejb, zohar, dhowells, jmorris, serge, linux-integrity, keyrings,
	linux-security-module, linux-kernel

On Fri, Apr 30, 2021 at 11:58:10AM -0700, trix@redhat.com wrote:
> From: Tom Rix <trix@redhat.com>
> 
> 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 <trix@redhat.com>

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

/Jarkko

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-05-03 14:56 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-30 18:58 [PATCH] KEYS: trusted: fix memory leak trix
2021-04-30 19:50 ` Ben Boeckel
2021-04-30 23:08   ` Tom Rix
2021-05-03 14:56 ` Jarkko Sakkinen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).