Skip to content

Check unchecked error-prone calls in ext/ssl #19659

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
alexandre-daubois wants to merge 2 commits into
base: PHP-8.4
Choose a base branch
from
+36 −12
Open

Check unchecked error-prone calls in ext/ssl #19659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f666ce6
Fix GH-18988: Check unchecked error-prone calls in ext/ssl
alexandre-daubois Sep 1, 2025
096d7b8
Address latest comment
alexandre-daubois Apr 8, 2026
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
2 changes: 2 additions & 0 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ PHP NEWS

- OpenSSL:
. Fix a bunch of memory leaks and crashes on edge cases. (ndossche)
. Fixed bug GH-18988 (Check various unchecked error-prone OpenSSL function
return values). (alexandre-daubois)

- SPL:
. Fixed bug GH-21499 (RecursiveArrayIterator getChildren UAF after parent
Expand Down
42 changes: 31 additions & 11 deletions ext/openssl/openssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -971,7 +971,9 @@ static int php_openssl_parse_config(struct php_x509_request * req, zval * option
if (str != NULL && php_openssl_check_path_ex(str, strlen(str), path, 0, false, false, "oid_file")) {
BIO *oid_bio = BIO_new_file(path, PHP_OPENSSL_BIO_MODE_R(PKCS7_BINARY));
if (oid_bio) {
OBJ_create_objects(oid_bio);
if (OBJ_create_objects(oid_bio) == 0) {
php_openssl_store_errors();
}
BIO_free(oid_bio);
php_openssl_store_errors();
}
Expand Down Expand Up @@ -1299,7 +1301,9 @@ PHP_MINIT_FUNCTION(openssl)
OSSL_PROVIDER_load(NULL, "legacy");
OSSL_PROVIDER_load(NULL, "default");
#endif
OPENSSL_init_ssl(OPENSSL_INIT_LOAD_CONFIG, NULL);
if (OPENSSL_init_ssl(OPENSSL_INIT_LOAD_CONFIG, NULL) != 1) {
php_error_docref(NULL, E_WARNING, "Failed to initialize OpenSSL");
}
#endif

/* register a resource id number with OpenSSL so that we can map SSL -> stream structures in
Expand Down Expand Up @@ -2060,22 +2064,34 @@ static int openssl_x509v3_subjectAltName(BIO *bio, X509_EXTENSION *extension)
name = sk_GENERAL_NAME_value(names, i);
switch (name->type) {
case GEN_EMAIL:
BIO_puts(bio, "email:");
if (BIO_puts(bio, "email:") < 0) {
php_openssl_store_errors();
}
as = name->d.rfc822Name;
BIO_write(bio, ASN1_STRING_get0_data(as),
ASN1_STRING_length(as));
if (BIO_write(bio, ASN1_STRING_get0_data(as),
ASN1_STRING_length(as)) < 0) {
php_openssl_store_errors();
}
break;
case GEN_DNS:
BIO_puts(bio, "DNS:");
if (BIO_puts(bio, "DNS:") < 0) {
php_openssl_store_errors();
}
as = name->d.dNSName;
BIO_write(bio, ASN1_STRING_get0_data(as),
ASN1_STRING_length(as));
if (BIO_write(bio, ASN1_STRING_get0_data(as),
ASN1_STRING_length(as)) < 0) {
php_openssl_store_errors();
}
break;
case GEN_URI:
BIO_puts(bio, "URI:");
if (BIO_puts(bio, "URI:") < 0) {
php_openssl_store_errors();
}
as = name->d.uniformResourceIdentifier;
BIO_write(bio, ASN1_STRING_get0_data(as),
ASN1_STRING_length(as));
if (BIO_write(bio, ASN1_STRING_get0_data(as),
ASN1_STRING_length(as)) < 0) {
php_openssl_store_errors();
}
break;
default:
/* use builtin print for GEN_OTHERNAME, GEN_X400,
Expand Down Expand Up @@ -2579,6 +2595,7 @@ static STACK_OF(X509) *php_array_to_X509_sk(zval * zcerts, uint32_t arg_num, con

}
if (sk_X509_push(sk, cert) <= 0) {
php_openssl_store_errors();
X509_free(cert);
goto push_fail_exit;
}
Expand All @@ -2600,6 +2617,7 @@ static STACK_OF(X509) *php_array_to_X509_sk(zval * zcerts, uint32_t arg_num, con
}
}
if (sk_X509_push(sk, cert) <= 0) {
php_openssl_store_errors();
X509_free(cert);
goto push_fail_exit;
}
Expand Down Expand Up @@ -5887,6 +5905,7 @@ PHP_FUNCTION(openssl_pkcs7_encrypt)
}
}
if (sk_X509_push(recipcerts, cert) <= 0) {
php_openssl_store_errors();
X509_free(cert);
goto clean_exit;
}
Expand All @@ -5911,6 +5930,7 @@ PHP_FUNCTION(openssl_pkcs7_encrypt)
}
}
if (sk_X509_push(recipcerts, cert) <= 0) {
php_openssl_store_errors();
X509_free(cert);
goto clean_exit;
}
Expand Down
4 changes: 3 additions & 1 deletion ext/openssl/xp_ssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1775,7 +1775,9 @@ static zend_result php_openssl_setup_crypto(php_stream *stream,
return FAILURE;
}
if (sslsock->is_client) {
SSL_CTX_set_alpn_protos(sslsock->ctx, alpn, alpn_len);
if (SSL_CTX_set_alpn_protos(sslsock->ctx, alpn, alpn_len) != 0) {
php_openssl_store_errors();
}
} else {
sslsock->alpn_ctx.data = (unsigned char *) pestrndup((const char*)alpn, alpn_len, php_stream_is_persistent(stream));
sslsock->alpn_ctx.len = alpn_len;
Expand Down
Loading