From 756377f113a52e331153490eea6f6fb2b5d1aca5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=AF=9A?= Date: Fri, 14 Nov 2025 17:06:38 +0800 Subject: [PATCH] Add patch to fix CVE-2025-4945 and CVE-2025-11021 --- CVE-2025-4945-CVE-2025-11021.patch | 246 +++++++++++++++++++++++++++++ libsoup3.spec | 7 +- 2 files changed, 252 insertions(+), 1 deletion(-) create mode 100644 CVE-2025-4945-CVE-2025-11021.patch diff --git a/CVE-2025-4945-CVE-2025-11021.patch b/CVE-2025-4945-CVE-2025-11021.patch new file mode 100644 index 0000000..2f11724 --- /dev/null +++ b/CVE-2025-4945-CVE-2025-11021.patch @@ -0,0 +1,246 @@ +From 8988379984e33dcc7d3aa58551db13e48755959f Mon Sep 17 00:00:00 2001 +From: Milan Crha +Date: Thu, 15 May 2025 07:59:14 +0200 +Subject: [PATCH 1/2] soup-date-utils: Add value checks for date/time parsing + +Reject date/time when it does not represent a valid value. + +Closes https://gitlab.gnome.org/GNOME/libsoup/-/issues/448 +--- + libsoup/soup-date-utils.c | 23 +++++++++++++++-------- + tests/cookies-test.c | 10 ++++++++++ + 2 files changed, 25 insertions(+), 8 deletions(-) + +diff --git a/libsoup/soup-date-utils.c b/libsoup/soup-date-utils.c +index fd785f509..34ca99503 100644 +--- a/libsoup/soup-date-utils.c ++++ b/libsoup/soup-date-utils.c +@@ -129,7 +129,7 @@ parse_day (int *day, const char **date_string) + while (*end == ' ' || *end == '-') + end++; + *date_string = end; +- return TRUE; ++ return *day >= 1 && *day <= 31; + } + + static inline gboolean +@@ -169,7 +169,7 @@ parse_year (int *year, const char **date_string) + while (*end == ' ' || *end == '-') + end++; + *date_string = end; +- return TRUE; ++ return *year > 0 && *year < 9999; + } + + static inline gboolean +@@ -193,7 +193,7 @@ parse_time (int *hour, int *minute, int *second, const char **date_string) + while (*p == ' ') + p++; + *date_string = p; +- return TRUE; ++ return *hour >= 0 && *hour < 24 && *minute >= 0 && *minute < 60 && *second >= 0 && *second < 60; + } + + static inline gboolean +@@ -209,9 +209,14 @@ parse_timezone (GTimeZone **timezone, const char **date_string) + gulong val; + int sign = (**date_string == '+') ? 1 : -1; + val = strtoul (*date_string + 1, (char **)date_string, 10); +- if (**date_string == ':') +- val = 60 * val + strtoul (*date_string + 1, (char **)date_string, 10); +- else ++ if (val > 9999) ++ return FALSE; ++ if (**date_string == ':') { ++ gulong val2 = strtoul (*date_string + 1, (char **)date_string, 10); ++ if (val > 99 || val2 > 99) ++ return FALSE; ++ val = 60 * val + val2; ++ } else + val = 60 * (val / 100) + (val % 100); + offset_minutes = sign * val; + utc = (sign == -1) && !val; +@@ -264,7 +269,8 @@ parse_textual_date (const char *date_string) + if (!parse_month (&month, &date_string) || + !parse_day (&day, &date_string) || + !parse_time (&hour, &minute, &second, &date_string) || +- !parse_year (&year, &date_string)) ++ !parse_year (&year, &date_string) || ++ !g_date_valid_dmy (day, month, year)) + return NULL; + + /* There shouldn't be a timezone, but check anyway */ +@@ -276,7 +282,8 @@ parse_textual_date (const char *date_string) + if (!parse_day (&day, &date_string) || + !parse_month (&month, &date_string) || + !parse_year (&year, &date_string) || +- !parse_time (&hour, &minute, &second, &date_string)) ++ !parse_time (&hour, &minute, &second, &date_string) || ++ !g_date_valid_dmy (day, month, year)) + return NULL; + + /* This time there *should* be a timezone, but we +diff --git a/tests/cookies-test.c b/tests/cookies-test.c +index 1d2d45630..ff809a400 100644 +--- a/tests/cookies-test.c ++++ b/tests/cookies-test.c +@@ -460,6 +460,15 @@ do_cookies_parsing_max_age_long_overflow (void) + soup_cookie_free (cookie); + } + ++static void ++do_cookies_parsing_int32_overflow (void) ++{ ++ SoupCookie *cookie = soup_cookie_parse ("Age=1;expires=3Mar9 999:9:9+ 999999999-age=main=gne=", NULL); ++ g_assert_nonnull (cookie); ++ g_assert_null (soup_cookie_get_expires (cookie)); ++ soup_cookie_free (cookie); ++} ++ + static void + do_cookies_equal_nullpath (void) + { +@@ -718,6 +727,7 @@ main (int argc, char **argv) + g_test_add_func ("/cookies/parsing/no-path-null-origin", do_cookies_parsing_nopath_nullorigin); + g_test_add_func ("/cookies/parsing/max-age-int32-overflow", do_cookies_parsing_max_age_int32_overflow); + g_test_add_func ("/cookies/parsing/max-age-long-overflow", do_cookies_parsing_max_age_long_overflow); ++ g_test_add_func ("/cookies/parsing/int32-overflow", do_cookies_parsing_int32_overflow); + g_test_add_func ("/cookies/parsing/equal-nullpath", do_cookies_equal_nullpath); + g_test_add_func ("/cookies/parsing/control-characters", do_cookies_parsing_control_characters); + g_test_add_func ("/cookies/parsing/name-value-max-size", do_cookies_parsing_name_value_max_size); +-- +GitLab + + +From 0d6bfa52da7313de848fb13fcfdbc561c04afef8 Mon Sep 17 00:00:00 2001 +From: Brian Yurko <155515-byurko@users.noreply.gitlab.gnome.org> +Date: Wed, 11 Jun 2025 11:00:56 -0400 +Subject: [PATCH 2/2] tests: Add tests for date-time including timezone + validation work + +These tests are built on top of earlier work in a related pull request. + +Closes #448 +--- + libsoup/soup-date-utils.c | 8 ++++---- + tests/cookies-test.c | 1 + + tests/date-test.c | 37 ++++++++++++++++++++++++++++++------- + 3 files changed, 35 insertions(+), 11 deletions(-) + +diff --git a/libsoup/soup-date-utils.c b/libsoup/soup-date-utils.c +index 34ca99503..73f80ab60 100644 +--- a/libsoup/soup-date-utils.c ++++ b/libsoup/soup-date-utils.c +@@ -40,7 +40,7 @@ soup_date_time_is_past (GDateTime *date) + g_return_val_if_fail (date != NULL, TRUE); + + /* optimization */ +- if (g_date_time_get_year (date) < 2020) ++ if (g_date_time_get_year (date) < 2025) + return TRUE; + + return g_date_time_to_unix (date) < time (NULL); +@@ -219,15 +219,15 @@ parse_timezone (GTimeZone **timezone, const char **date_string) + } else + val = 60 * (val / 100) + (val % 100); + offset_minutes = sign * val; +- utc = (sign == -1) && !val; ++ utc = (sign == -1) && !val; + } else if (**date_string == 'Z') { + offset_minutes = 0; +- utc = TRUE; ++ utc = TRUE; + (*date_string)++; + } else if (!strcmp (*date_string, "GMT") || + !strcmp (*date_string, "UTC")) { + offset_minutes = 0; +- utc = TRUE; ++ utc = TRUE; + (*date_string) += 3; + } else if (strchr ("ECMP", **date_string) && + ((*date_string)[1] == 'D' || (*date_string)[1] == 'S') && +diff --git a/tests/cookies-test.c b/tests/cookies-test.c +index ff809a400..18c9b60d8 100644 +--- a/tests/cookies-test.c ++++ b/tests/cookies-test.c +@@ -464,6 +464,7 @@ static void + do_cookies_parsing_int32_overflow (void) + { + SoupCookie *cookie = soup_cookie_parse ("Age=1;expires=3Mar9 999:9:9+ 999999999-age=main=gne=", NULL); ++ g_test_bug ("https://gitlab.gnome.org/GNOME/libsoup/-/issues/448"); + g_assert_nonnull (cookie); + g_assert_null (soup_cookie_get_expires (cookie)); + soup_cookie_free (cookie); +diff --git a/tests/date-test.c b/tests/date-test.c +index 7eefd7c00..abf89ddd1 100644 +--- a/tests/date-test.c ++++ b/tests/date-test.c +@@ -92,6 +92,11 @@ static const OkDate ok_dates[] = { + { "Sat, 06 Nov 2004 08:09:07", NULL }, + { "06 Nov 2004 08:09:07 GMT", NULL }, + { "SAT, 06 NOV 2004 08:09:07 +1000", "644048" }, ++ { "Sat, 06-Nov-2004 08:09:07 -10000", "https://gitlab.gnome.org/GNOME/libsoup/-/issues/448" }, ++ { "Sat, 06-Nov-2004 08:09:07 +01:30", "https://gitlab.gnome.org/GNOME/libsoup/-/issues/448" }, ++ { "Sat, 06-Nov-2004 08:09:07 +0:180", "https://gitlab.gnome.org/GNOME/libsoup/-/issues/448" }, ++ { "Sat, 06-Nov-2004 08:09:07 +100:100", "https://gitlab.gnome.org/GNOME/libsoup/-/issues/448" }, ++ { "Sat, 06-Nov-2004 08:09:07 Z", "https://gitlab.gnome.org/GNOME/libsoup/-/issues/448" }, + + /* rfc850-date, and broken variants */ + { "Saturday, 06-Nov-04 08:09:07 GMT", NULL }, +@@ -109,6 +114,8 @@ static const OkDate ok_dates[] = { + { "Sat Nov 06 08:09:07 2004", NULL }, + { "Sat Nov 6 08:09:07 2004", NULL }, + { "Sat Nov 6 08:09:07 2004 GMT", NULL }, ++ { "Sat Nov 6 08:09:07 2004 NoZone", "https://gitlab.gnome.org/GNOME/libsoup/-/issues/448" }, ++ { "Sat Nov 6 08:09:07 2004 UTC", "https://gitlab.gnome.org/GNOME/libsoup/-/issues/448" }, + + /* Netscape cookie spec date, and broken variants */ + { "Sat, 06-Nov-2004 08:09:07 GMT", NULL }, +@@ -182,7 +189,23 @@ static const BadDate bad_dates[] = { + { "Sat Nov 6 08::07 2004", NULL }, + { "Sat Nov 6 08:09: 2004", NULL }, + { "Sat Nov 6 08:09:07", NULL }, +- { "Sat Nov 6 08:09:07 GMT 2004", NULL } ++ { "Sat Nov 6 08:09:07 GMT 2004", NULL }, ++ ++ /* range constraints added "https://gitlab.gnome.org/GNOME/libsoup/-/issues/448" */ ++ { "Sat, 00-Nov-2004 08:09:07 GMT", NULL }, ++ { "Sat, 32-Nov-2004 08:09:07 GMT", NULL }, ++ { "Sat, 06-Nov-0 08:09:07 GMT", NULL }, ++ { "Sat, 06-Nov-9999 08:09:07 GMT", NULL }, ++ { "Sat, 06-Nov-2004 0-1:09:07 GMT", NULL }, ++ { "(Sat), Nov 6 -1:09:07 2004", NULL }, ++ { "Sat, 06-Nov-2004 24:09:07 GMT", NULL }, ++ { "Sat, 06-Nov-2004 08:-1:07 GMT", NULL }, ++ { "Sat, 06-Nov-2004 08:60:07 GMT", NULL }, ++ { "Sat, 06-Nov-2004 08:09:-10 GMT", NULL }, ++ { "Sat, 06-Nov-2004 08:09:60 GMT", NULL }, ++ { "Sat, 06-Nov-71 08:09:99 UTC", NULL }, ++ { "Sat, 31-Feb-2004 08:09:07 UTC", NULL }, ++ { "2004-11-06T08:09:07Z", NULL } + }; + + static void +@@ -198,12 +221,12 @@ check_bad (gconstpointer data) + soup_test_assert (date == NULL, + "date parsing succeeded for '%s': %d %d %d - %d %d %d", + bad->date, +- g_date_time_get_year (date), +- g_date_time_get_month (date), +- g_date_time_get_day_of_month (date), +- g_date_time_get_hour (date), +- g_date_time_get_minute (date), +- g_date_time_get_second (date)); ++ g_date_time_get_year (date), ++ g_date_time_get_month (date), ++ g_date_time_get_day_of_month (date), ++ g_date_time_get_hour (date), ++ g_date_time_get_minute (date), ++ g_date_time_get_second (date)); + g_clear_pointer (&date, g_date_time_unref); + } + +-- +GitLab + + diff --git a/libsoup3.spec b/libsoup3.spec index 0e50cba..1a40290 100644 --- a/libsoup3.spec +++ b/libsoup3.spec @@ -1,4 +1,4 @@ -%define anolis_release 4 +%define anolis_release 5 %global glib2_version 2.69.1 %{!?with_docs: %global with_docs 1} @@ -19,6 +19,8 @@ Patch0: 1000-CVE-2025-4948.patch Patch1: CVE-2025-32907.patch # https://gitlab.com/redhat/centos-stream/rpms/libsoup3/-/commit/97ce8107a1f7cc11e85a1332057b77f469d3414a Patch2: CVE-2025-4035.patch +# https://git.rockylinux.org/staging/src-rhel/rpms/libsoup3/-/blob/c10/SOURCES/RHEL-117629.patch?ref_type=heads +Patch3: CVE-2025-4945-CVE-2025-11021.patch BuildRequires: gcc BuildRequires: gettext BuildRequires: glib-networking @@ -115,6 +117,9 @@ install -m 644 -D tests/libsoup.supp %{buildroot}%{_datadir}/libsoup-3.0/libsoup %doc README NEWS AUTHORS %changelog +* Fri Nov 14 2025 YangCheng - 3.6.5-5 +- Add patch to fix CVE-2025-4945 and CVE-2025-11021 + * Tue Sep 23 2025 Hong Wei Qin - 3.6.5-4 - add patch to fix CVE-2025-4035 -- Gitee