[PATCH] key: return proper value and avoid leak

[PATCH] key: return proper value and avoid leak

[Thomas Hindoe Paaboel Andersen]

[-- Attachment #1: Type: text/plain, Size: 731 bytes --]

The return value was incorrect for bool. The code should also go to
'done' to free sig_hash.
---
 ell/key.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ell/key.c b/ell/key.c
index ad88d81..a71bdc8 100644
--- a/ell/key.c
+++ b/ell/key.c
@@ -603,8 +603,10 @@ LIB_EXPORT bool l_key_verify(struct l_key *key,
 	uint8_t *sig_hash = l_malloc(len_sig);
 
 	/* Other checksum types are not yet supported */
-	if (checksum != L_CHECKSUM_NONE)
-		return -EINVAL;
+	if (checksum != L_CHECKSUM_NONE) {
+		success = false;
+		goto done;
+	}
 
 	/* The keyctl verify implementation compares the verify results
 	 * before we get a chance to unpad it. Instead, use the *encrypt*
-- 
2.9.3

Re: [PATCH] key: return proper value and avoid leak

[Denis Kenzior]

[-- Attachment #1: Type: text/plain, Size: 307 bytes --]

Hi Thomas,

On 10/11/2016 04:38 PM, Thomas Hindoe Paaboel Andersen wrote:
> The return value was incorrect for bool. The code should also go to
> 'done' to free sig_hash.
> ---
>   ell/key.c | 6 ++++--
>   1 file changed, 4 insertions(+), 2 deletions(-)
>

Applied, thanks.

Regards,
-Denis