From: David Sommerseth <dav...@openvpn.net>
If the key_state_gen_auth_control_files() call fails, the code would
just return without freeing the argv container. Instead the code should
jump to an appropriate exit point where memory is being released.
Also adjust the related comment, to indicate that these deferred auth
control files are really pre-created.
Signed-off-by: David Sommerseth <dav...@openvpn.net>
Reported-by: Trial of Bits (TOB-OVPN-2)
Signed-off-by: Arne Schwabe <a...@rfc2549.org>
---
src/openvpn/ssl_verify.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/openvpn/ssl_verify.c b/src/openvpn/ssl_verify.c
index 76cb9f19b..228cf16e1 100644
--- a/src/openvpn/ssl_verify.c
+++ b/src/openvpn/ssl_verify.c
@@ -1358,12 +1358,13 @@ verify_user_pass_script(struct tls_session *session,
struct tls_multi *multi,
setenv_str(session->opt->es, "password", up->password);
}
- /* generate filename for deferred auth control file */
+ /* pre-create files for deferred auth control */
if (!key_state_gen_auth_control_files(&ks->script_auth, session->opt))
{
msg(D_TLS_ERRORS, "TLS Auth Error (%s): "
"could not create deferred auth control file", __func__);
- return OPENVPN_PLUGIN_FUNC_ERROR;
+ retval = OPENVPN_PLUGIN_FUNC_ERROR;
+ goto error;
}
/* call command */
@@ -1412,6 +1413,7 @@ done:
platform_unlink(tmp_file);
}
+error:
argv_free(&argv);
gc_free(&gc);
return retval;
--
2.37.1 (Apple Git-137.1)
_______________________________________________
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
