Skip to contentSkip to conversation

PKCS#7: fix a possible memory leak when calculating the digest

PATCH In review Denis Glazkov 2 participants 2 messages Feb 24, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 PKCS#7: fix a possible memory leak when calculating the digest

In function pkcs7_digest, if there is an error allocating memory for the shash_desc structure, the public key signature digest remains unfreed.

---
 crypto/asymmetric_keys/pkcs7_verify.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
crypto/asymmetric_keys/pkcs7_verify.c +3 -1
index 0b4d07aa8811..e6f648dcc02a 100644
@@ -50,7 +50,7 @@ static int pkcs7_digest(struct pkcs7_message *pkcs7,
 	ret = -ENOMEM;
 	sig->digest = kmalloc(sig->digest_size, GFP_KERNEL);
 	if (!sig->digest)
-		goto error_no_desc;
+		goto error_no_digest;
 
 	desc = kzalloc(desc_size, GFP_KERNEL);
 	if (!desc)
@@ -117,6 +117,8 @@ static int pkcs7_digest(struct pkcs7_message *pkcs7,
 error:
 	kfree(desc);
 error_no_desc:
+	kfree(sig->digest);
+error_no_digest:
 	crypto_free_shash(tfm);
 	kleave(" = %d", ret);
 	return ret;
Signature · 1 line
2.25.1
#1 lore raw
Quoted 33 lines · Denis Glazkov

In function pkcs7_digest, if there is an error allocating memory for the shash_desc structure, the public key signature digest remains unfreed.

---
 crypto/asymmetric_keys/pkcs7_verify.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
crypto/asymmetric_keys/pkcs7_verify.c +3 -1
index 0b4d07aa8811..e6f648dcc02a 100644
@@ -50,7 +50,7 @@ static int pkcs7_digest(struct pkcs7_message *pkcs7,
 	ret = -ENOMEM;
 	sig->digest = kmalloc(sig->digest_size, GFP_KERNEL);
 	if (!sig->digest)
-		goto error_no_desc;
+		goto error_no_digest;
 
 	desc = kzalloc(desc_size, GFP_KERNEL);
 	if (!desc)
@@ -117,6 +117,8 @@ static int pkcs7_digest(struct pkcs7_message *pkcs7,
 error:
 	kfree(desc);
 error_no_desc:
+	kfree(sig->digest);
+error_no_digest:
 	crypto_free_shash(tfm);
 	kleave(" = %d", ret);
 	return ret;
Signature · 1 line
2.25.1

Doesn't this introduce a double free? public_key_signature_free() frees this too.

- Eric