Skip to content

mod_ssl: fix leak of X509 reference in ssl_hook_Access_classic quick renegotiation path #649

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rootvector2 wants to merge 1 commit into
base: trunk
Choose a base branch
from
+17 −1
Open

mod_ssl: fix leak of X509 reference in ssl_hook_Access_classic quick renegotiation path #649

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion modules/ssl/ssl_engine_kernel.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -721,6 +721,7 @@ static int ssl_hook_Access_classic(request_rec *r, SSLSrvConfigRec *sc, SSLDirCo
if (renegotiate_quick) {
STACK_OF(X509) *cert_stack;
X509 *cert;
X509 *peer_cert;

/* perform just a manual re-verification of the peer */
ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(02258)
Expand All @@ -729,7 +730,12 @@ static int ssl_hook_Access_classic(request_rec *r, SSLSrvConfigRec *sc, SSLDirCo

cert_stack = (STACK_OF(X509) *)SSL_get_peer_cert_chain(ssl);

cert = SSL_get_peer_certificate(ssl);
/* SSL_get_peer_certificate() increments the X509 refcount; the
* reference is owned here and must be released with X509_free()
* unless ownership is transferred into a stack we then pop_free.
*/
peer_cert = SSL_get_peer_certificate(ssl);
cert = peer_cert;

if (!cert_stack || (sk_X509_num(cert_stack) == 0)) {
if (!cert) {
Expand All @@ -746,6 +752,7 @@ static int ssl_hook_Access_classic(request_rec *r, SSLSrvConfigRec *sc, SSLDirCo
*/
cert_stack = sk_X509_new_null();
sk_X509_push(cert_stack, cert);
peer_cert = NULL; /* ownership transferred to cert_stack */
}

if (!(cert_store ||
Expand All @@ -754,6 +761,10 @@ static int ssl_hook_Access_classic(request_rec *r, SSLSrvConfigRec *sc, SSLDirCo
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(02223)
"Cannot find certificate storage");

if (cert_stack != SSL_get_peer_cert_chain(ssl)) {
sk_X509_pop_free(cert_stack, X509_free);
}
if (peer_cert) X509_free(peer_cert);
return HTTP_FORBIDDEN;
}

Expand All @@ -764,6 +775,10 @@ static int ssl_hook_Access_classic(request_rec *r, SSLSrvConfigRec *sc, SSLDirCo
cert_store_ctx = X509_STORE_CTX_new();
if (!X509_STORE_CTX_init(cert_store_ctx, cert_store, cert, cert_stack)) {
X509_STORE_CTX_free(cert_store_ctx);
if (cert_stack != SSL_get_peer_cert_chain(ssl)) {
sk_X509_pop_free(cert_stack, X509_free);
}
if (peer_cert) X509_free(peer_cert);
return HTTP_FORBIDDEN;
}
depth = SSL_get_verify_depth(ssl);
Expand All @@ -790,6 +805,7 @@ static int ssl_hook_Access_classic(request_rec *r, SSLSrvConfigRec *sc, SSLDirCo
/* we created this ourselves, so free it */
sk_X509_pop_free(cert_stack, X509_free);
}
if (peer_cert) X509_free(peer_cert);
}
else {
char peekbuf[1];
Expand Down