mirror of
https://git.yoctoproject.org/poky
synced 2026-05-30 12:29:55 +00:00
libsoup: fix CVE-2025-4945
Refer: https://gitlab.gnome.org/GNOME/libsoup/-/issues/448 (From OE-Core rev: cd589717c05b887986b9d61f5193e764f4deb3ee) Signed-off-by: Changqing Li <changqing.li@windriver.com> Signed-off-by: Steve Sakoman <steve@sakoman.com>
This commit is contained in:
committed by
Steve Sakoman
parent
65b1587627
commit
def97edcef
@@ -0,0 +1,118 @@
|
|||||||
|
From ee76a57af0e9fe1e43d3ab5a146a3da233573819 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Milan Crha <mcrha@redhat.com>
|
||||||
|
Date: Thu, 15 May 2025 07:59:14 +0200
|
||||||
|
Subject: [PATCH] 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
|
||||||
|
|
||||||
|
CVE: CVE-2025-4945
|
||||||
|
Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/8988379984e33dcc7d3aa58551db13e48755959f]
|
||||||
|
|
||||||
|
Signed-off-by: Changqing Li <changqing.li@windriver.com>
|
||||||
|
---
|
||||||
|
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 061057e..43616d6 100644
|
||||||
|
--- a/libsoup/soup-date-utils.c
|
||||||
|
+++ b/libsoup/soup-date-utils.c
|
||||||
|
@@ -138,7 +138,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
|
||||||
|
@@ -178,7 +178,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
|
||||||
|
@@ -202,7 +202,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
|
||||||
|
@@ -218,9 +218,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;
|
||||||
|
@@ -273,7 +278,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 */
|
||||||
|
@@ -285,7 +291,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 1c04534..6ba4458 100644
|
||||||
|
--- a/tests/cookies-test.c
|
||||||
|
+++ b/tests/cookies-test.c
|
||||||
|
@@ -419,6 +419,15 @@ do_remove_feature_test (void)
|
||||||
|
g_uri_unref (uri);
|
||||||
|
}
|
||||||
|
|
||||||
|
+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);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
int
|
||||||
|
main (int argc, char **argv)
|
||||||
|
{
|
||||||
|
@@ -440,6 +449,7 @@ main (int argc, char **argv)
|
||||||
|
g_test_add_func ("/cookies/accept-policy-subdomains", do_cookies_subdomain_policy_test);
|
||||||
|
g_test_add_func ("/cookies/parsing", do_cookies_parsing_test);
|
||||||
|
g_test_add_func ("/cookies/parsing/no-path-null-origin", do_cookies_parsing_nopath_nullorigin);
|
||||||
|
+ g_test_add_func ("/cookies/parsing/int32-overflow", do_cookies_parsing_int32_overflow);
|
||||||
|
g_test_add_func ("/cookies/get-cookies/empty-host", do_get_cookies_empty_host_test);
|
||||||
|
g_test_add_func ("/cookies/remove-feature", do_remove_feature_test);
|
||||||
|
g_test_add_func ("/cookies/secure-cookies", do_cookies_strict_secure_test);
|
||||||
|
--
|
||||||
|
2.34.1
|
||||||
|
|
||||||
@@ -44,6 +44,7 @@ SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz \
|
|||||||
file://CVE-2025-32051-2.patch \
|
file://CVE-2025-32051-2.patch \
|
||||||
file://CVE-2025-46421.patch \
|
file://CVE-2025-46421.patch \
|
||||||
file://CVE-2025-4948.patch \
|
file://CVE-2025-4948.patch \
|
||||||
|
file://CVE-2025-4945.patch \
|
||||||
"
|
"
|
||||||
SRC_URI[sha256sum] = "ebdf90cf3599c11acbb6818a9d9e3fc9d2c68e56eb829b93962972683e1bf7c8"
|
SRC_URI[sha256sum] = "ebdf90cf3599c11acbb6818a9d9e3fc9d2c68e56eb829b93962972683e1bf7c8"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user