diff options
| author | Changqing Li <changqing.li@windriver.com> | 2025-12-24 13:00:12 +0800 |
|---|---|---|
| committer | Steve Sakoman <steve@sakoman.com> | 2026-01-02 06:56:54 -0800 |
| commit | a4841fb5a255e13f03c8252f14fbc14a490b9424 (patch) | |
| tree | d68a9a7fa43ec3931f8bac44a8abf9f3928acf5e | |
| parent | 17a65b334db0c82c8e0c9516bd9787f5c0b7fd1f (diff) | |
| download | poky-a4841fb5a255e13f03c8252f14fbc14a490b9424.tar.gz | |
libsoup: fix CVE-2025-12105
Refer:
https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/481
(From OE-Core rev: 1ac9ad3faf022684ae709f4494a430aee5fb9906)
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
| -rw-r--r-- | meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2025-12105.patch | 34 | ||||
| -rw-r--r-- | meta/recipes-support/libsoup/libsoup_3.4.4.bb | 1 |
2 files changed, 35 insertions, 0 deletions
diff --git a/meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2025-12105.patch b/meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2025-12105.patch new file mode 100644 index 0000000000..a460554d6f --- /dev/null +++ b/meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2025-12105.patch | |||
| @@ -0,0 +1,34 @@ | |||
| 1 | From 4cbb31f5bf083442325692ff16559fed73f3a6cf Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Eugene Mutavchi <Ievgen_Mutavchi@comcast.com> | ||
| 3 | Date: Fri, 10 Oct 2025 16:24:27 +0000 | ||
| 4 | Subject: [PATCH] fix 'heap-use-after-free' caused by 'finishing' queue item | ||
| 5 | twice | ||
| 6 | |||
| 7 | CVE: CVE-2025-12105 | ||
| 8 | Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/9ba1243a24e442fa5ec44684617a4480027da960] | ||
| 9 | |||
| 10 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
| 11 | --- | ||
| 12 | libsoup/soup-session.c | 6 ++++-- | ||
| 13 | 1 file changed, 4 insertions(+), 2 deletions(-) | ||
| 14 | |||
| 15 | diff --git a/libsoup/soup-session.c b/libsoup/soup-session.c | ||
| 16 | index 9f00b05..649902f 100644 | ||
| 17 | --- a/libsoup/soup-session.c | ||
| 18 | +++ b/libsoup/soup-session.c | ||
| 19 | @@ -2822,8 +2822,10 @@ run_until_read_done (SoupMessage *msg, | ||
| 20 | if (soup_message_io_in_progress (msg)) | ||
| 21 | soup_message_io_finished (msg); | ||
| 22 | item->paused = FALSE; | ||
| 23 | - item->state = SOUP_MESSAGE_FINISHING; | ||
| 24 | - soup_session_process_queue_item (item->session, item, FALSE); | ||
| 25 | + if (item->state != SOUP_MESSAGE_FINISHED) { | ||
| 26 | + item->state = SOUP_MESSAGE_FINISHING; | ||
| 27 | + soup_session_process_queue_item (item->session, item, FALSE); | ||
| 28 | + } | ||
| 29 | } | ||
| 30 | async_send_request_return_result (item, NULL, error); | ||
| 31 | } | ||
| 32 | -- | ||
| 33 | 2.34.1 | ||
| 34 | |||
diff --git a/meta/recipes-support/libsoup/libsoup_3.4.4.bb b/meta/recipes-support/libsoup/libsoup_3.4.4.bb index f64d0d6745..c09b06fec2 100644 --- a/meta/recipes-support/libsoup/libsoup_3.4.4.bb +++ b/meta/recipes-support/libsoup/libsoup_3.4.4.bb | |||
| @@ -45,6 +45,7 @@ SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz \ | |||
| 45 | file://CVE-2025-4948.patch \ | 45 | file://CVE-2025-4948.patch \ |
| 46 | file://CVE-2025-2784.patch \ | 46 | file://CVE-2025-2784.patch \ |
| 47 | file://CVE-2025-4945.patch \ | 47 | file://CVE-2025-4945.patch \ |
| 48 | file://CVE-2025-12105.patch \ | ||
| 48 | " | 49 | " |
| 49 | SRC_URI[sha256sum] = "291c67725f36ed90ea43efff25064b69c5a2d1981488477c05c481a3b4b0c5aa" | 50 | SRC_URI[sha256sum] = "291c67725f36ed90ea43efff25064b69c5a2d1981488477c05c481a3b4b0c5aa" |
| 50 | 51 | ||
