Fix Memory corruption (zend_mm_heap corrupted) in openssl_encrypt with AES-WRAP-PAD CVE-2026-14355
Resolves: RHEL-192629
This commit is contained in:
Remi Collet
parent
0d15d688d2
commit
6ec1d1a35b
111
php-cve-2026-14355.patch
Normal file
111
php-cve-2026-14355.patch
Normal file
@ -0,0 +1,111 @@
|
||||
From e058b01e1bd23421a425cffae9f458b0fa8db222 Mon Sep 17 00:00:00 2001
|
||||
From: David Carlier <devnexen@gmail.com>
|
||||
Date: Fri, 29 May 2026 21:44:14 +0100
|
||||
Subject: [PATCH] ext/openssl: openssl_encrypt() zend mm heap overflow on
|
||||
AES-WRAP-PAD mode.
|
||||
|
||||
Fix #22186
|
||||
|
||||
close GH-22187
|
||||
|
||||
(cherry picked from commit cbc0489126a7682796aad1e5fb4e51de74af162c)
|
||||
(cherry picked from commit 95e9851111d249e43948b76663cff1baeb5e758d)
|
||||
(cherry picked from commit 2a73e91a9f9136fbbfcc9177573b6af71e3d5dce)
|
||||
---
|
||||
NEWS | 6 ++++++
|
||||
ext/openssl/openssl.c | 15 ++++++++++++++-
|
||||
ext/openssl/tests/gh22186.phpt | 32 ++++++++++++++++++++++++++++++++
|
||||
3 files changed, 52 insertions(+), 1 deletion(-)
|
||||
create mode 100644 ext/openssl/tests/gh22186.phpt
|
||||
|
||||
diff --git a/NEWS b/NEWS
|
||||
index d4d668b3afb..328fd6d6de6 100644
|
||||
--- a/NEWS
|
||||
+++ b/NEWS
|
||||
@@ -1,6 +1,12 @@
|
||||
PHP NEWS
|
||||
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
||||
|
||||
+Backported from 8.2.32
|
||||
+
|
||||
+- OpenSSL:
|
||||
+ . Fixed bug GH-22187 (Memory corruption (zend_mm_heap corrupted) in
|
||||
+ openssl_encrypt with AES-WRAP-PAD). (David Carlier)
|
||||
+
|
||||
Backported from 8.2.31
|
||||
|
||||
- FPM:
|
||||
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
|
||||
index aa819be4224..a443f7baed3 100644
|
||||
--- a/ext/openssl/openssl.c
|
||||
+++ b/ext/openssl/openssl.c
|
||||
@@ -6670,6 +6670,7 @@ static int php_openssl_cipher_update(const EVP_CIPHER *cipher_type,
|
||||
char *aad, size_t aad_len, int enc) /* {{{ */
|
||||
{
|
||||
int i = 0;
|
||||
+ size_t outlen = data_len + EVP_CIPHER_block_size(cipher_type);
|
||||
|
||||
if (mode->is_single_run_aead && !EVP_CipherUpdate(cipher_ctx, NULL, &i, NULL, (int)data_len)) {
|
||||
php_openssl_store_errors();
|
||||
@@ -6683,7 +6684,19 @@ static int php_openssl_cipher_update(const EVP_CIPHER *cipher_type,
|
||||
return FAILURE;
|
||||
}
|
||||
|
||||
- *poutbuf = zend_string_alloc((int)data_len + EVP_CIPHER_block_size(cipher_type), 0);
|
||||
+#ifdef EVP_CIPH_WRAP_MODE
|
||||
+ if ((EVP_CIPHER_mode(cipher_type)) == EVP_CIPH_WRAP_MODE) {
|
||||
+ /*
|
||||
+ * RFC 5649 wrap-with-padding rounds the input up to the block size
|
||||
+ * and prepends an integrity block, we reserve one extra block.
|
||||
+ * See EVP_EncryptUpdate(3): wrap mode may write up to
|
||||
+ * inl + cipher_block_size bytes.
|
||||
+ */
|
||||
+ outlen += EVP_CIPHER_block_size(cipher_type);
|
||||
+ }
|
||||
+#endif
|
||||
+
|
||||
+ *poutbuf = zend_string_alloc(outlen, 0);
|
||||
|
||||
if (!EVP_CipherUpdate(cipher_ctx, (unsigned char*)ZSTR_VAL(*poutbuf),
|
||||
&i, (unsigned char *)data, (int)data_len)) {
|
||||
diff --git a/ext/openssl/tests/gh22186.phpt b/ext/openssl/tests/gh22186.phpt
|
||||
new file mode 100644
|
||||
index 00000000000..8f28e6c45b5
|
||||
--- /dev/null
|
||||
+++ b/ext/openssl/tests/gh22186.phpt
|
||||
@@ -0,0 +1,32 @@
|
||||
+--TEST--
|
||||
+GH-22186 (Heap buffer overflow in openssl_encrypt with AES-WRAP-PAD)
|
||||
+--EXTENSIONS--
|
||||
+openssl
|
||||
+--SKIPIF--
|
||||
+<?php
|
||||
+/* openssl_get_cipher_methods() enumerates provider ciphers, but openssl_encrypt()
|
||||
+ * resolves names via the legacy EVP_get_cipherbyname(), so on some builds the
|
||||
+ * cipher is listed yet not usable. Probe the actual call path instead. */
|
||||
+if (!@openssl_encrypt("test", "aes-128-wrap-pad", str_repeat("k", 16),
|
||||
+ OPENSSL_RAW_DATA | OPENSSL_DONT_ZERO_PAD_KEY, str_repeat("\0", 4))) {
|
||||
+ die('skip aes-128-wrap-pad not usable on this OpenSSL build');
|
||||
+}
|
||||
+?>
|
||||
+--FILE--
|
||||
+<?php
|
||||
+$pass = str_repeat("k", 16);
|
||||
+$iv = str_repeat("\0", 4);
|
||||
+
|
||||
+for ($i = 1; $i < 258; $i++) {
|
||||
+ $data = str_repeat("a", $i);
|
||||
+ $enc = openssl_encrypt($data, 'aes-128-wrap-pad', $pass, OPENSSL_RAW_DATA | OPENSSL_DONT_ZERO_PAD_KEY, $iv);
|
||||
+ $dec = openssl_decrypt($enc, 'aes-128-wrap-pad', $pass, OPENSSL_RAW_DATA | OPENSSL_DONT_ZERO_PAD_KEY, $iv);
|
||||
+ if ($dec !== $data) {
|
||||
+ die("mismatch at $i\n");
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+echo "done\n";
|
||||
+?>
|
||||
+--EXPECT--
|
||||
+done
|
||||
--
|
||||
2.54.0
|
||||
|
||||
9
php.spec
9
php.spec
@ -60,7 +60,7 @@
|
||||
Summary: PHP scripting language for creating dynamic web sites
|
||||
Name: php
|
||||
Version: %{upver}%{?rcver:~%{rcver}}
|
||||
Release: 4%{?dist}
|
||||
Release: 5%{?dist}
|
||||
# All files licensed under PHP version 3.01, except
|
||||
# Zend is licensed under Zend
|
||||
# TSRM is licensed under BSD
|
||||
@ -146,6 +146,8 @@ Patch233: php-cve-2026-7262.patch
|
||||
Patch234: php-cve-2026-6735.patch
|
||||
Patch235: php-cve-2026-7568.patch
|
||||
Patch236: php-cve-2026-7258.patch
|
||||
# from 8.2.32
|
||||
Patch237: php-cve-2026-14355.patch
|
||||
|
||||
# Fixes for tests (300+)
|
||||
# Factory is droped from system tzdata
|
||||
@ -792,6 +794,7 @@ in pure PHP.
|
||||
%patch -P234 -p1 -b .cve6735
|
||||
%patch -P235 -p1 -b .cve7268
|
||||
%patch -P236 -p1 -b .cve7258
|
||||
%patch -P237 -p1 -b .cve14355
|
||||
|
||||
# Fixes for tests
|
||||
%patch -P300 -p1 -b .datetests
|
||||
@ -1581,6 +1584,10 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || :
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Jul 10 2026 Remi Collet <rcollet@redhat.com> - 7.4.33-5
|
||||
- Fix Memory corruption (zend_mm_heap corrupted) in openssl_encrypt with AES-WRAP-PAD
|
||||
CVE-2026-14355
|
||||
|
||||
* Thu Jun 4 2026 Remi Collet <rcollet@redhat.com> - 7.4.33-4
|
||||
- Fix XSS within status endpoint
|
||||
CVE-2026-6735
|
||||
|
||||
Loading…
Reference in New Issue
Block a user