Skip to content

Fix various memory leaks related to openssl exports #16692

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

Closed
wants to merge 1 commit into from
Closed

Fix various memory leaks related to openssl exports #16692

Show file tree
Hide file tree
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
19 changes: 11 additions & 8 deletions ext/openssl/openssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1495,7 +1495,7 @@ PHP_FUNCTION(openssl_x509_export_to_file)
}

if (!php_openssl_check_path(filename, filename_len, file_path, 2)) {
return;
goto exit_cleanup_cert;
}

bio_out = BIO_new_file(file_path, PHP_OPENSSL_BIO_MODE_W(PKCS7_BINARY));
Expand All @@ -1513,13 +1513,14 @@ PHP_FUNCTION(openssl_x509_export_to_file)
php_error_docref(NULL, E_WARNING, "Error opening file %s", file_path);
}

if (cert_str) {
X509_free(cert);
}

if (!BIO_free(bio_out)) {
php_openssl_store_errors();
}

exit_cleanup_cert:
if (cert_str) {
X509_free(cert);
}
}
/* }}} */

Expand Down Expand Up @@ -3064,7 +3065,7 @@ PHP_FUNCTION(openssl_csr_export_to_file)
}

if (!php_openssl_check_path(filename, filename_len, file_path, 2)) {
return;
goto exit_cleanup;
}

bio_out = BIO_new_file(file_path, PHP_OPENSSL_BIO_MODE_W(PKCS7_BINARY));
Expand All @@ -3084,6 +3085,7 @@ PHP_FUNCTION(openssl_csr_export_to_file)
php_error_docref(NULL, E_WARNING, "Error opening file %s", file_path);
}

exit_cleanup:
if (csr_str) {
X509_REQ_free(csr);
}
Expand Down Expand Up @@ -4555,7 +4557,7 @@ PHP_FUNCTION(openssl_pkey_export_to_file)
}

if (!php_openssl_check_path(filename, filename_len, file_path, 2)) {
RETURN_FALSE;
goto clean_exit_key;
}

PHP_SSL_REQ_INIT(&req);
Expand Down Expand Up @@ -4591,8 +4593,9 @@ PHP_FUNCTION(openssl_pkey_export_to_file)

clean_exit:
PHP_SSL_REQ_DISPOSE(&req);
EVP_PKEY_free(key);
BIO_free(bio_out);
clean_exit_key:
EVP_PKEY_free(key);
}
/* }}} */

Expand Down
14 changes: 14 additions & 0 deletions ext/openssl/tests/openssl_csr_export_to_file_leak.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
--TEST--
openssl_csr_export_to_file memory leak
--EXTENSIONS--
openssl
--FILE--
<?php

$path = "file://" . __DIR__ . "/cert.csr";
var_dump(openssl_csr_export_to_file($path, str_repeat("a", 10000)));

?>
--EXPECTF--
Warning: openssl_csr_export_to_file(output_filename): must be a valid file path %s
bool(false)
15 changes: 15 additions & 0 deletions ext/openssl/tests/openssl_pkey_export_to_file_leak.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
--TEST--
openssl_pkey_export_to_file memory leak
--EXTENSIONS--
openssl
--FILE--
<?php

$path = "file://" . __DIR__ . "/private_rsa_1024.key";
$key = [$path, ""];
var_dump(openssl_pkey_export_to_file($key, str_repeat("a", 10000), passphrase: ""));

?>
--EXPECTF--
Warning: openssl_pkey_export_to_file(output_filename): must be a valid file path %s
bool(false)
14 changes: 14 additions & 0 deletions ext/openssl/tests/openssl_x509_export_to_file_leak.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
--TEST--
openssl_x509_export_to_file memory leak
--EXTENSIONS--
openssl
--FILE--
<?php

$path = "file://" . __DIR__ . "/sni_server_ca.pem";
var_dump(openssl_x509_export_to_file($path, str_repeat("a", 10000)));

?>
--EXPECTF--
Warning: openssl_x509_export_to_file(output_filename): must be a valid file path %s
bool(false)
Loading