diff options
| -rw-r--r-- | meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32909.patch | 36 | ||||
| -rw-r--r-- | meta/recipes-support/libsoup/libsoup-2.4_2.74.2.bb | 1 |
2 files changed, 37 insertions, 0 deletions
diff --git a/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32909.patch b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32909.patch new file mode 100644 index 0000000000..046f20203f --- /dev/null +++ b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32909.patch | |||
| @@ -0,0 +1,36 @@ | |||
| 1 | From ba4c3a6f988beff59e45801ab36067293d24ce92 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Patrick Griffis <pgriffis@igalia.com> | ||
| 3 | Date: Wed, 8 Jan 2025 16:30:17 -0600 | ||
| 4 | Subject: [PATCH] content-sniffer: Handle sniffing resource shorter than 4 | ||
| 5 | bytes | ||
| 6 | |||
| 7 | Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/ba4c3a6f988beff59e45801ab36067293d24ce92] | ||
| 8 | CVE: CVE-2025-32909 | ||
| 9 | Signed-off-by: Vijay Anusuri <vanusuri@mvista.com> | ||
| 10 | --- | ||
| 11 | libsoup/soup-content-sniffer.c | 7 ++++++- | ||
| 12 | 1 file changed, 6 insertions(+), 1 deletion(-) | ||
| 13 | |||
| 14 | diff --git a/libsoup/soup-content-sniffer.c b/libsoup/soup-content-sniffer.c | ||
| 15 | index 967ec61..a1f23c2 100644 | ||
| 16 | --- a/libsoup/soup-content-sniffer.c | ||
| 17 | +++ b/libsoup/soup-content-sniffer.c | ||
| 18 | @@ -227,9 +227,14 @@ sniff_mp4 (SoupContentSniffer *sniffer, SoupBuffer *buffer) | ||
| 19 | { | ||
| 20 | const char *resource = (const char *)buffer->data; | ||
| 21 | guint resource_length = MIN (512, buffer->length); | ||
| 22 | - guint32 box_size = *((guint32*)resource); | ||
| 23 | + guint32 box_size; | ||
| 24 | guint i; | ||
| 25 | |||
| 26 | + if (resource_length < sizeof (guint32)) | ||
| 27 | + return FALSE; | ||
| 28 | + | ||
| 29 | + box_size = *((guint32*)resource); | ||
| 30 | + | ||
| 31 | #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ | ||
| 32 | box_size = ((box_size >> 24) | | ||
| 33 | ((box_size << 8) & 0x00FF0000) | | ||
| 34 | -- | ||
| 35 | 2.25.1 | ||
| 36 | |||
diff --git a/meta/recipes-support/libsoup/libsoup-2.4_2.74.2.bb b/meta/recipes-support/libsoup/libsoup-2.4_2.74.2.bb index f409816fc2..00f7fea41a 100644 --- a/meta/recipes-support/libsoup/libsoup-2.4_2.74.2.bb +++ b/meta/recipes-support/libsoup/libsoup-2.4_2.74.2.bb | |||
| @@ -21,6 +21,7 @@ SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz \ | |||
| 21 | file://CVE-2024-52531-2.patch \ | 21 | file://CVE-2024-52531-2.patch \ |
| 22 | file://CVE-2025-32906-1.patch \ | 22 | file://CVE-2025-32906-1.patch \ |
| 23 | file://CVE-2025-32906-2.patch \ | 23 | file://CVE-2025-32906-2.patch \ |
| 24 | file://CVE-2025-32909.patch \ | ||
| 24 | " | 25 | " |
| 25 | SRC_URI[sha256sum] = "f0a427656e5fe19e1df71c107e88dfa1b2e673c25c547b7823b6018b40d01159" | 26 | SRC_URI[sha256sum] = "f0a427656e5fe19e1df71c107e88dfa1b2e673c25c547b7823b6018b40d01159" |
| 26 | 27 | ||
