commit 06986de4ea3e62a1276d070ab62b51ad257e0ab2
author Paul Elliott <62069445+paul-elliott-arm@users.noreply.github.com> Tue Jul 05 23:12:11 2022 +0100
committer GitHub <noreply@github.com> Tue Jul 05 23:12:11 2022 +0100
tree 3459236a3fbab05231a9840bd72a0a85e53e654a
parent e3954e36d9f763ba38e3345b1c471d62d3bc8923
parent cd5e671b5aef0dffeb83aa173efa14e125d273cd

Merge pull request #6066 from AndrzejKurek/fix-some-resource-leaks-2-28

Fix `mbedtls_pk_parse_public_key` resource leaks

ChangeLog.d/fix_some_resource_leaks.txt

diff --git a/ChangeLog.d/fix_some_resource_leaks.txt b/ChangeLog.d/fix_some_resource_leaks.txt
new file mode 100644
index 0000000..f8db3f2
--- /dev/null
+++ b/ChangeLog.d/fix_some_resource_leaks.txt
@@ -0,0 +1,4 @@
+Bugfix
+   * Fix resource leaks in mbedtls_pk_parse_public_key() in low
+     memory conditions.
+

library/pkparse.c

diff --git a/library/pkparse.c b/library/pkparse.c
index cfc1dca..ea5c6b6 100644
--- a/library/pkparse.c
+++ b/library/pkparse.c
@@ -1463,10 +1463,16 @@
     {
         p = pem.buf;
         if( ( pk_info = mbedtls_pk_info_from_type( MBEDTLS_PK_RSA ) ) == NULL )
+        {
+            mbedtls_pem_free( &pem );
             return( MBEDTLS_ERR_PK_UNKNOWN_PK_ALG );
+        }
 
         if( ( ret = mbedtls_pk_setup( ctx, pk_info ) ) != 0 )
+        {
+            mbedtls_pem_free( &pem );
             return( ret );
+        }
 
         if ( ( ret = pk_get_rsapubkey( &p, p + pem.buflen, mbedtls_pk_rsa( *ctx ) ) ) != 0 )
             mbedtls_pk_free( ctx );