From: Emeric Brun Date: Wed, 12 Nov 2014 16:35:37 +0000 (+0100) Subject: BUG/MEDIUM: ssl: fix bad ssl context init can cause segfault in case of OOM. X-Git-Tag: v1.6-dev1~278 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5547615cdac377797ae351a2e024376dbf6d6963;p=thirdparty%2Fhaproxy.git BUG/MEDIUM: ssl: fix bad ssl context init can cause segfault in case of OOM. Some SSL context's init functions errors were not handled and can cause a segfault due to an incomplete SSL context initialization. This fix must be backported to 1.5. --- diff --git a/src/ssl_sock.c b/src/ssl_sock.c index fbf8f9a624..41bd63dc63 100644 --- a/src/ssl_sock.c +++ b/src/ssl_sock.c @@ -2048,15 +2048,29 @@ static int ssl_sock_init(struct connection *conn) return -1; } - SSL_set_connect_state(conn->xprt_ctx); - if (objt_server(conn->target)->ssl_ctx.reused_sess) - SSL_set_session(conn->xprt_ctx, objt_server(conn->target)->ssl_ctx.reused_sess); - /* set fd on SSL session context */ - SSL_set_fd(conn->xprt_ctx, conn->t.sock.fd); + if (!SSL_set_fd(conn->xprt_ctx, conn->t.sock.fd)) { + SSL_free(conn->xprt_ctx); + conn->xprt_ctx = NULL; + conn->err_code = CO_ER_SSL_NO_MEM; + return -1; + } /* set connection pointer */ - SSL_set_app_data(conn->xprt_ctx, conn); + if (!SSL_set_app_data(conn->xprt_ctx, conn)) { + SSL_free(conn->xprt_ctx); + conn->xprt_ctx = NULL; + conn->err_code = CO_ER_SSL_NO_MEM; + return -1; + } + + SSL_set_connect_state(conn->xprt_ctx); + if (objt_server(conn->target)->ssl_ctx.reused_sess) { + if(!SSL_set_session(conn->xprt_ctx, objt_server(conn->target)->ssl_ctx.reused_sess)) { + SSL_SESSION_free(objt_server(conn->target)->ssl_ctx.reused_sess); + objt_server(conn->target)->ssl_ctx.reused_sess = NULL; + } + } /* leave init state and start handshake */ conn->flags |= CO_FL_SSL_WAIT_HS | CO_FL_WAIT_L6_CONN; @@ -2073,13 +2087,23 @@ static int ssl_sock_init(struct connection *conn) return -1; } - SSL_set_accept_state(conn->xprt_ctx); - /* set fd on SSL session context */ - SSL_set_fd(conn->xprt_ctx, conn->t.sock.fd); + if (!SSL_set_fd(conn->xprt_ctx, conn->t.sock.fd)) { + SSL_free(conn->xprt_ctx); + conn->xprt_ctx = NULL; + conn->err_code = CO_ER_SSL_NO_MEM; + return -1; + } /* set connection pointer */ - SSL_set_app_data(conn->xprt_ctx, conn); + if (!SSL_set_app_data(conn->xprt_ctx, conn)) { + SSL_free(conn->xprt_ctx); + conn->xprt_ctx = NULL; + conn->err_code = CO_ER_SSL_NO_MEM; + return -1; + } + + SSL_set_accept_state(conn->xprt_ctx); /* leave init state and start handshake */ conn->flags |= CO_FL_SSL_WAIT_HS | CO_FL_WAIT_L6_CONN;