mirror of
https://git.yoctoproject.org/poky
synced 2026-02-20 08:29:42 +01:00
libsoup: Fix CVE-2025-32909
Upstream-Status: Backport from https://gitlab.gnome.org/GNOME/libsoup/-/comm it/ba4c3a6f988beff59e45801ab36067293d24ce92 (From OE-Core rev: 9eba43f18664a20d7f5dc8942eb39cfbd83c066e) Signed-off-by: Vijay Anusuri <vanusuri@mvista.com> Signed-off-by: Steve Sakoman <steve@sakoman.com>
This commit is contained in:
committed by
Steve Sakoman
parent
1ec178a3cb
commit
ef68583826
@@ -0,0 +1,36 @@
|
||||
From ba4c3a6f988beff59e45801ab36067293d24ce92 Mon Sep 17 00:00:00 2001
|
||||
From: Patrick Griffis <pgriffis@igalia.com>
|
||||
Date: Wed, 8 Jan 2025 16:30:17 -0600
|
||||
Subject: [PATCH] content-sniffer: Handle sniffing resource shorter than 4
|
||||
bytes
|
||||
|
||||
Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/ba4c3a6f988beff59e45801ab36067293d24ce92]
|
||||
CVE: CVE-2025-32909
|
||||
Signed-off-by: Vijay Anusuri <vanusuri@mvista.com>
|
||||
---
|
||||
libsoup/content-sniffer/soup-content-sniffer.c | 7 ++++++-
|
||||
1 file changed, 6 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/libsoup/content-sniffer/soup-content-sniffer.c b/libsoup/content-sniffer/soup-content-sniffer.c
|
||||
index 5a181ff1..aeee2e25 100644
|
||||
--- a/libsoup/content-sniffer/soup-content-sniffer.c
|
||||
+++ b/libsoup/content-sniffer/soup-content-sniffer.c
|
||||
@@ -243,9 +243,14 @@ sniff_mp4 (SoupContentSniffer *sniffer, GBytes *buffer)
|
||||
gsize resource_length;
|
||||
const char *resource = g_bytes_get_data (buffer, &resource_length);
|
||||
resource_length = MIN (512, resource_length);
|
||||
- guint32 box_size = *((guint32*)resource);
|
||||
+ guint32 box_size;
|
||||
guint i;
|
||||
|
||||
+ if (resource_length < sizeof (guint32))
|
||||
+ return FALSE;
|
||||
+
|
||||
+ box_size = *((guint32*)resource);
|
||||
+
|
||||
#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
|
||||
box_size = ((box_size >> 24) |
|
||||
((box_size << 8) & 0x00FF0000) |
|
||||
--
|
||||
GitLab
|
||||
|
||||
@@ -21,6 +21,7 @@ SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz \
|
||||
file://CVE-2025-32910-1.patch \
|
||||
file://CVE-2025-32910-2.patch \
|
||||
file://CVE-2025-32910-3.patch \
|
||||
file://CVE-2025-32909.patch \
|
||||
"
|
||||
SRC_URI[sha256sum] = "291c67725f36ed90ea43efff25064b69c5a2d1981488477c05c481a3b4b0c5aa"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user