Skip to content

Commit 1673112

Browse files
Tom AtkinsonMylesBorins
Tom Atkinson
authored andcommitted
crypto: fix memory leak if certificate is revoked
The additional validity checks applied to StartCom and WoSign certificates failed to free memory before returning. Refs: #9469 Fixes: #12033 PR-URL: #12089 Reviewed-By: Sam Roberts <[email protected]> Reviewed-By: Fedor Indutny <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Myles Borins <[email protected]> Reviewed-By: Shigeki Ohtsu <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>
1 parent 21944e8 commit 1673112

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

src/node_crypto.cc

+6-2
Original file line numberDiff line numberDiff line change
@@ -2769,7 +2769,9 @@ inline bool CertIsStartComOrWoSign(X509_NAME* name) {
27692769
startcom_wosign_data = dn.data;
27702770
startcom_wosign_name = d2i_X509_NAME(nullptr, &startcom_wosign_data,
27712771
dn.len);
2772-
if (X509_NAME_cmp(name, startcom_wosign_name) == 0)
2772+
int cmp = X509_NAME_cmp(name, startcom_wosign_name);
2773+
X509_NAME_free(startcom_wosign_name);
2774+
if (cmp == 0)
27732775
return true;
27742776
}
27752777

@@ -2814,8 +2816,10 @@ inline CheckResult CheckWhitelistedServerCert(X509_STORE_CTX* ctx) {
28142816
}
28152817

28162818
X509* leaf_cert = sk_X509_value(chain, 0);
2817-
if (!CheckStartComOrWoSign(root_name, leaf_cert))
2819+
if (!CheckStartComOrWoSign(root_name, leaf_cert)) {
2820+
sk_X509_pop_free(chain, X509_free);
28182821
return CHECK_CERT_REVOKED;
2822+
}
28192823

28202824
// When the cert is issued from either CNNNIC ROOT CA or CNNNIC EV
28212825
// ROOT CA, check a hash of its leaf cert if it is in the whitelist.

0 commit comments

Comments
 (0)