Fix a possible memleak in bind_afalg
authorBernd Edlinger <bernd.edlinger@hotmail.de>
Sun, 28 Jan 2024 22:50:16 +0000 (23:50 +0100)
committerMatt Caswell <matt@openssl.org>
Wed, 31 Jan 2024 10:33:01 +0000 (10:33 +0000)
bind_afalg calls afalg_aes_cbc which allocates
cipher_handle->_hidden global object(s)
but if one of them fails due to out of memory,
the function bind_afalg relies on the engine destroy
method to be called.  But that does not happen
because the dynamic engine object is not destroyed
in the usual way in dynamic_load in this case:

If the bind_engine function fails, there will be no
further calls into the shared object.
See ./crypto/engine/eng_dyn.c near the comment:
/* Copy the original ENGINE structure back */

Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23409)

(cherry picked from commit 729a1496cc4cda669dea6501c991113c78f04560)

engines/e_afalg.c

index 2c08cbb28dde390840edb9b6edcbdc7503173f04..ccef155ea293c51d54480606014322155c9505a8 100644 (file)
@@ -811,8 +811,10 @@ static int bind_helper(ENGINE *e, const char *id)
     if (!afalg_chk_platform())
         return 0;
 
-    if (!bind_afalg(e))
+    if (!bind_afalg(e)) {
+        afalg_destroy(e);
         return 0;
+    }
     return 1;
 }