1099dd3ec7
Fix Configuring a proxy in a stream context might allow for CRLF injection in URIs CVE-2024-11234 Fix Single byte overread with convert.quoted-printable-decode filter CVE-2024-11233 Fix cgi.force_redirect configuration is bypassable due to the environment variable collision CVE-2024-8927 Fix Logs from childrens may be altered CVE-2024-9026 Fix Erroneous parsing of multipart form data CVE-2024-8925 Fix filter bypass in filter_var FILTER_VALIDATE_URL CVE-2024-5458 Fix __Host-/__Secure- cookie bypass due to partial CVE-2022-31629 fix CVE-2024-2756 Fix password_verify can erroneously return true opening ATO risk CVE-2024-3096 Resolves: RHEL-71275
118 lines
3.8 KiB
Diff
118 lines
3.8 KiB
Diff
From 5d9e54065ed18c51e4f25d8900635f90810c7394 Mon Sep 17 00:00:00 2001
|
|
From: Niels Dossche <7771979+nielsdos@users.noreply.github.com>
|
|
Date: Thu, 24 Oct 2024 22:02:17 +0200
|
|
Subject: [PATCH 1/8] Fix GHSA-5hqh-c84r-qjcv: Integer overflow in the dblib
|
|
quoter causing OOB writes
|
|
|
|
(cherry picked from commit d9baa9fed8c3ba692a36b388c0c7762e5102e2e0)
|
|
---
|
|
ext/pdo_dblib/dblib_driver.c | 8 ++++++-
|
|
ext/pdo_dblib/tests/GHSA-5hqh-c84r-qjcv.phpt | 24 ++++++++++++++++++++
|
|
2 files changed, 31 insertions(+), 1 deletion(-)
|
|
create mode 100644 ext/pdo_dblib/tests/GHSA-5hqh-c84r-qjcv.phpt
|
|
|
|
diff --git a/ext/pdo_dblib/dblib_driver.c b/ext/pdo_dblib/dblib_driver.c
|
|
index 7f160a402f7..d7d0901ea1a 100644
|
|
--- a/ext/pdo_dblib/dblib_driver.c
|
|
+++ b/ext/pdo_dblib/dblib_driver.c
|
|
@@ -152,6 +152,7 @@ static int dblib_handle_quoter(pdo_dbh_t *dbh, const char *unquoted, size_t unqu
|
|
|
|
size_t i;
|
|
char * q;
|
|
+ size_t extralen = 0;
|
|
*quotedlen = 0;
|
|
|
|
if (H->assume_national_character_set_strings) {
|
|
@@ -166,7 +167,7 @@ static int dblib_handle_quoter(pdo_dbh_t *dbh, const char *unquoted, size_t unqu
|
|
|
|
/* Detect quoted length, adding extra char for doubled single quotes */
|
|
for (i = 0; i < unquotedlen; i++) {
|
|
- if (unquoted[i] == '\'') ++*quotedlen;
|
|
+ if (unquoted[i] == '\'') ++extralen;
|
|
++*quotedlen;
|
|
}
|
|
|
|
@@ -174,6 +175,11 @@ static int dblib_handle_quoter(pdo_dbh_t *dbh, const char *unquoted, size_t unqu
|
|
if (use_national_character_set) {
|
|
++*quotedlen; /* N prefix */
|
|
}
|
|
+ if (UNEXPECTED(*quotedlen > ZSTR_MAX_LEN - extralen)) {
|
|
+ return 0;
|
|
+ }
|
|
+
|
|
+ *quotedlen += extralen;
|
|
q = *quoted = emalloc(*quotedlen + 1); /* Add byte for terminal null */
|
|
if (use_national_character_set) {
|
|
*q++ = 'N';
|
|
diff --git a/ext/pdo_dblib/tests/GHSA-5hqh-c84r-qjcv.phpt b/ext/pdo_dblib/tests/GHSA-5hqh-c84r-qjcv.phpt
|
|
new file mode 100644
|
|
index 00000000000..431c61951ee
|
|
--- /dev/null
|
|
+++ b/ext/pdo_dblib/tests/GHSA-5hqh-c84r-qjcv.phpt
|
|
@@ -0,0 +1,24 @@
|
|
+--TEST--
|
|
+GHSA-5hqh-c84r-qjcv (Integer overflow in the dblib quoter causing OOB writes)
|
|
+--EXTENSIONS--
|
|
+pdo_dblib
|
|
+--SKIPIF--
|
|
+<?php
|
|
+if (PHP_INT_SIZE != 4) die("skip for 32bit platforms only");
|
|
+if (PHP_OS_FAMILY === "Windows") die("skip not for Windows because the virtual address space for application is only 2GiB");
|
|
+if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
|
|
+require __DIR__ . '/config.inc';
|
|
+getDbConnection();
|
|
+?>
|
|
+--INI--
|
|
+memory_limit=-1
|
|
+--FILE--
|
|
+<?php
|
|
+
|
|
+require __DIR__ . '/config.inc';
|
|
+$db = getDbConnection();
|
|
+var_dump($db->quote(str_repeat("'", 2147483646)));
|
|
+
|
|
+?>
|
|
+--EXPECT--
|
|
+bool(false)
|
|
--
|
|
2.47.0
|
|
|
|
From b4f73be75dbdde970a18cc7a636898b10400fb3f Mon Sep 17 00:00:00 2001
|
|
From: Niels Dossche <7771979+nielsdos@users.noreply.github.com>
|
|
Date: Thu, 24 Oct 2024 22:02:36 +0200
|
|
Subject: [PATCH 2/8] Fix GHSA-5hqh-c84r-qjcv: Integer overflow in the firebird
|
|
quoter causing OOB writes
|
|
|
|
(cherry picked from commit 69c5f68fdc3deed9ebce2cc44b4bf5e0c47cd28f)
|
|
---
|
|
ext/pdo_firebird/firebird_driver.c | 6 +++++-
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/ext/pdo_firebird/firebird_driver.c b/ext/pdo_firebird/firebird_driver.c
|
|
index e0a424c56ab..fb697978503 100644
|
|
--- a/ext/pdo_firebird/firebird_driver.c
|
|
+++ b/ext/pdo_firebird/firebird_driver.c
|
|
@@ -663,7 +663,7 @@ free_statement:
|
|
static int firebird_handle_quoter(pdo_dbh_t *dbh, const char *unquoted, size_t unquotedlen, /* {{{ */
|
|
char **quoted, size_t *quotedlen, enum pdo_param_type paramtype)
|
|
{
|
|
- int qcount = 0;
|
|
+ size_t qcount = 0;
|
|
char const *co, *l, *r;
|
|
char *c;
|
|
|
|
@@ -678,6 +678,10 @@ static int firebird_handle_quoter(pdo_dbh_t *dbh, const char *unquoted, size_t u
|
|
/* count the number of ' characters */
|
|
for (co = unquoted; (co = strchr(co,'\'')); qcount++, co++);
|
|
|
|
+ if (UNEXPECTED(unquotedlen + 2 > ZSTR_MAX_LEN - qcount)) {
|
|
+ return 0;
|
|
+ }
|
|
+
|
|
*quotedlen = unquotedlen + qcount + 2;
|
|
*quoted = c = emalloc(*quotedlen+1);
|
|
*c++ = '\'';
|
|
--
|
|
2.47.0
|
|
|