Commit b04d83bb1d for openssl.org
commit b04d83bb1dd451ea28b1439b2fa8cdf0aa4be7a0
Author: Niels Dossche <niels.dossche@ugent.be>
Date: Tue Sep 8 11:35:16 2026 +0200
Fix memory leak of der_buf on error in x942_encode_otherinfo()
Reviewed-by: Mounir Idrassi <mounir.idrassi@idrix.fr>
Reviewed-by: Jakub Zelenka <jakub.zelenka@openssl.foundation>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
Merge-date: Thu Sep 17 14:02:02 2026
Merged-from: https://github.com/openssl/openssl/pull/32738
diff --git a/providers/implementations/kdfs/x942kdf.c b/providers/implementations/kdfs/x942kdf.c
index 3565243cc9..10466c132d 100644
--- a/providers/implementations/kdfs/x942kdf.c
+++ b/providers/implementations/kdfs/x942kdf.c
@@ -260,9 +260,11 @@ x942_encode_otherinfo(size_t keylen,
goto err;
*out_ctr = (pcounter + 2);
*der = der_buf;
+ der_buf = NULL;
*der_len = der_buflen;
ret = 1;
err:
+ OPENSSL_free(der_buf);
WPACKET_cleanup(&pkt);
return ret;
}