Skip to content
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

php: upgrade to 8.3.12 to fix CVE-2024-8927, CVE-2024-8925 #10747

Merged
merged 2 commits into from
Oct 22, 2024
Merged

php: upgrade to 8.3.12 to fix CVE-2024-8927, CVE-2024-8925 #10747

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
c601feb
php: upgrade to 8.3.12 to fix CVE-2024-8927, CVE-2024-8925
arc9693 Oct 16, 2024
26a6162
php: update cgmanifest
arc9693 Oct 16, 2024
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
Empty file added SPECS/php/CVE-test.patch
View file
Open in desktop
Empty file.
91 changes: 66 additions & 25 deletions SPECS/php/php-8.3.0-systzdata-v24.patch → SPECS/php/php-8.3.12-systzdata-v25.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,10 @@ r2: add filesystem trawl to set up name alias index
r1: initial revision


diff --git a/ext/date/config0.m4 b/ext/date/config0.m4
index 6b803bf33e..53c3cdb3f4 100644
--- a/ext/date/config0.m4
+++ b/ext/date/config0.m4
@@ -4,6 +4,19 @@ AC_CHECK_HEADERS([io.h])
diff --color -ruN b/ext/date/config0.m4 a/ext/date/config0.m4
--- b/ext/date/config0.m4 2024-09-24 18:08:04.000000000 +0000
+++ a/ext/date/config0.m4 2024-10-16 12:11:31.140181713 +0000
@@ -4,6 +4,19 @@
dnl Check for strtoll, atoll
AC_CHECK_FUNCS(strtoll atoll)

Expand All @@ -57,13 +56,57 @@ index 6b803bf33e..53c3cdb3f4 100644
+ fi
+fi
+
PHP_DATE_CFLAGS="-Wno-implicit-fallthrough -I@ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DHAVE_TIMELIB_CONFIG_H=1"
timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c lib/parse_posix.c
lib/timelib.c lib/tm2unixtime.c lib/unixtime2tm.c lib/parse_iso_intervals.c lib/interval.c"
diff --git a/ext/date/lib/parse_tz.c b/ext/date/lib/parse_tz.c
index c7f93580d7..ec196a98b6 100644
--- a/ext/date/lib/parse_tz.c
+++ b/ext/date/lib/parse_tz.c
AX_CHECK_COMPILE_FLAG([-Wno-implicit-fallthrough],
[PHP_DATE_CFLAGS="$PHP_DATE_CFLAGS -Wno-implicit-fallthrough"],,
[-Werror])
diff --color -ruN b/ext/date/config0.m4.orig a/ext/date/config0.m4.orig
--- b/ext/date/config0.m4.orig 1970-01-01 00:00:00.000000000 +0000
+++ a/ext/date/config0.m4.orig 2024-09-24 18:08:04.000000000 +0000
@@ -0,0 +1,41 @@
+dnl Check for headers needed by timelib
+AC_CHECK_HEADERS([io.h])
+
+dnl Check for strtoll, atoll
+AC_CHECK_FUNCS(strtoll atoll)
+
+AX_CHECK_COMPILE_FLAG([-Wno-implicit-fallthrough],
+ [PHP_DATE_CFLAGS="$PHP_DATE_CFLAGS -Wno-implicit-fallthrough"],,
+ [-Werror])
+
+PHP_DATE_CFLAGS="$PHP_DATE_CFLAGS -I@ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DHAVE_TIMELIB_CONFIG_H=1"
+timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c lib/parse_posix.c
+ lib/timelib.c lib/tm2unixtime.c lib/unixtime2tm.c lib/parse_iso_intervals.c lib/interval.c"
+
+PHP_NEW_EXTENSION(date, php_date.c $timelib_sources, no,, $PHP_DATE_CFLAGS)
+
+PHP_ADD_BUILD_DIR([$ext_builddir/lib], 1)
+PHP_ADD_INCLUDE([$ext_builddir/lib])
+PHP_ADD_INCLUDE([$ext_srcdir/lib])
+
+PHP_INSTALL_HEADERS([ext/date], [php_date.h lib/timelib.h lib/timelib_config.h])
+AC_DEFINE([HAVE_TIMELIB_CONFIG_H], [1], [Have timelib_config.h])
+
+cat > $ext_builddir/lib/timelib_config.h <<EOF
+#ifdef PHP_WIN32
+# include "config.w32.h"
+#else
+# include <php_config.h>
+#endif
+#include <inttypes.h>
+#include <stdint.h>
+
+#include "zend.h"
+
+#define timelib_malloc emalloc
+#define timelib_realloc erealloc
+#define timelib_calloc ecalloc
+#define timelib_strdup estrdup
+#define timelib_strndup estrndup
+#define timelib_free efree
+EOF
diff --color -ruN b/ext/date/lib/parse_tz.c a/ext/date/lib/parse_tz.c
--- b/ext/date/lib/parse_tz.c 2024-09-24 18:08:04.000000000 +0000
+++ a/ext/date/lib/parse_tz.c 2024-10-16 12:11:31.140181713 +0000
@@ -26,9 +26,33 @@
#include "timelib.h"
#include "timelib_private.h"
Expand Down Expand Up @@ -98,7 +141,7 @@ index c7f93580d7..ec196a98b6 100644

#if (defined(__APPLE__) || defined(__APPLE_CC__)) && (defined(__BIG_ENDIAN__) || defined(__LITTLE_ENDIAN__))
# if defined(__LITTLE_ENDIAN__)
@@ -95,6 +119,11 @@ static int read_php_preamble(const unsigned char **tzf, timelib_tzinfo *tz)
@@ -95,6 +119,11 @@
{
uint32_t version;

Expand All @@ -110,7 +153,7 @@ index c7f93580d7..ec196a98b6 100644
/* read ID */
version = (*tzf)[3] - '0';
*tzf += 4;
@@ -577,7 +606,475 @@ void timelib_dump_tzinfo(timelib_tzinfo *tz)
@@ -577,7 +606,475 @@
}
}

Expand Down Expand Up @@ -587,7 +630,7 @@ index c7f93580d7..ec196a98b6 100644
{
int left = 0, right = tzdb->index_size - 1;

@@ -603,9 +1100,49 @@ static int seek_to_tz_position(const unsigned char **tzf, const char *timezone,
@@ -603,9 +1100,49 @@
return 0;
}

Expand Down Expand Up @@ -637,7 +680,7 @@ index c7f93580d7..ec196a98b6 100644
}

const timelib_tzdb_index_entry *timelib_timezone_identifiers_list(const timelib_tzdb *tzdb, int *count)
@@ -617,7 +1154,32 @@ const timelib_tzdb_index_entry *timelib_timezone_identifiers_list(const timelib_
@@ -617,7 +1154,32 @@
int timelib_timezone_id_is_valid(const char *timezone, const timelib_tzdb *tzdb)
{
const unsigned char *tzf;
Expand Down Expand Up @@ -671,7 +714,7 @@ index c7f93580d7..ec196a98b6 100644
}

static int skip_64bit_preamble(const unsigned char **tzf, timelib_tzinfo *tz)
@@ -662,6 +1224,8 @@ static timelib_tzinfo* timelib_tzinfo_ctor(const char *name)
@@ -662,6 +1224,8 @@
timelib_tzinfo *timelib_parse_tzfile(const char *timezone, const timelib_tzdb *tzdb, int *error_code)
{
const unsigned char *tzf;
Expand All @@ -680,7 +723,7 @@ index c7f93580d7..ec196a98b6 100644
timelib_tzinfo *tmp;
int version;
int transitions_result, types_result;
@@ -669,7 +1233,7 @@ timelib_tzinfo *timelib_parse_tzfile(const char *timezone, const timelib_tzdb *t
@@ -669,7 +1233,7 @@

*error_code = TIMELIB_ERROR_NO_ERROR;

Expand All @@ -689,7 +732,7 @@ index c7f93580d7..ec196a98b6 100644
tmp = timelib_tzinfo_ctor(timezone);

version = read_preamble(&tzf, tmp, &type);
@@ -712,11 +1276,38 @@ timelib_tzinfo *timelib_parse_tzfile(const char *timezone, const timelib_tzdb *t
@@ -712,11 +1276,38 @@
return NULL;
}

Expand Down Expand Up @@ -728,11 +771,10 @@ index c7f93580d7..ec196a98b6 100644
} else {
*error_code = TIMELIB_ERROR_NO_SUCH_TIMEZONE;
tmp = NULL;
diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index 48c82bf7ec..443299c089 100644
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -490,7 +490,11 @@ PHP_MINFO_FUNCTION(date)
diff --color -ruN b/ext/date/php_date.c a/ext/date/php_date.c
--- b/ext/date/php_date.c 2024-09-24 18:08:04.000000000 +0000
+++ a/ext/date/php_date.c 2024-10-16 12:11:31.144181704 +0000
@@ -490,7 +490,11 @@
php_info_print_table_row(2, "date/time support", "enabled");
php_info_print_table_row(2, "timelib version", TIMELIB_ASCII_VERSION);
php_info_print_table_row(2, "\"Olson\" Timezone Database Version", tzdb->version);
Expand All @@ -743,4 +785,3 @@ index 48c82bf7ec..443299c089 100644
+#endif
php_info_print_table_row(2, "Default timezone", guess_timezone(tzdb));
php_info_print_table_end();

4 changes: 2 additions & 2 deletions SPECS/php/php.signatures.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"nginx-fpm.conf": "5a222ab2c3fc0145cb67a1c5125471bbf097de304e77c9858e7077a3b4fcad59",
"nginx-php.conf": "b3b3f744c4c122302fcb11f39cac78d01cef15ee6f8bd67e98b3438efcf8dc95",
"opcache-default.blacklist": "4eef0875e1a0c6a75b8a2bafd4ddc029b83be74dd336a6a99214b0c32808cb38",
"php-8.3.8.tar.xz": "aea358b56186f943c2bbd350c9005b9359133d47e954cfc561385319ae5bb8d7",
"php-8.3.12.tar.xz": "f774e28633e26fc8c5197f4dae58ec9e3ff87d1b4311cbc61ab05a7ad24bd131",
"php-fpm-www.conf": "1cacdd4962c01a0a968933c38db503023940ad9105f021bdab85d6cdc46dcbb8",
"php-fpm.conf": "bb261d53b9b42bb163a7637bb373ffa18a20dddf27a3efe6cb5ed1b1cf5981a9",
"php-fpm.logrotate": "7d8279bebb9ffabc596a2699150e93d4ce4513245890b9b786d337288b19fa79",
Expand All @@ -16,4 +16,4 @@
"php.ini": "8fd5a4d891c19320c07010fbbbac982c886b422bc8d062acaeae49d70c136fc8",
"php.modconf": "dc7303ea584452d2f742d002a648abe74905025aabf240259c7e8bd01746d278"
}
}
}
8 changes: 6 additions & 2 deletions SPECS/php/php.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
%global with_qdbm 0
Summary: PHP scripting language for creating dynamic web sites
Name: php
Version: 8.3.8
Version: 8.3.12
Release: 1%{?dist}
# All files licensed under PHP version 3.01, except
# Zend is licensed under Zend
Expand Down Expand Up @@ -70,7 +70,7 @@ Patch8: php-8.1.0-libdb.patch
# Use system nikic/php-parser
Patch41: php-8.3.3-parser.patch
# use system tzdata
Patch42: php-8.3.0-systzdata-v24.patch
Patch42: php-8.3.12-systzdata-v25.patch
# See http://bugs.php.net/53436
Patch43: php-7.4.0-phpize.patch
# Use -lldap_r for OpenLDAP
Expand Down Expand Up @@ -1514,6 +1514,10 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || :
%dir %{_datadir}/php/preload

%changelog
* Wed Oct 16 2024 Archana Choudhary <[email protected]> - 8.3.12-1
- Upgarde to 8.3.12 to fix CVE-2024-8927, CVE-2024-8925
- Refactor patch (with fuzzing) for system tzdata

* Tue Jun 11 2024 Neha Agarwal <[email protected]> - 8.3.8-1
- Upgrade to 8.3.8 to fix CVE-2024-4577, CVE-2024-5458, CVE-2024-5585

Expand Down
4 changes: 2 additions & 2 deletions cgmanifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20813,8 +20813,8 @@
"type": "other",
"other": {
"name": "php",
"version": "8.3.8",
"downloadUrl": "https://www.php.net/distributions/php-8.3.8.tar.xz"
"version": "8.3.12",
"downloadUrl": "https://www.php.net/distributions/php-8.3.12.tar.xz"
}
}
},
Expand Down
Loading