Patch review
cover Patch review
Please review this set of changes for scarthgap and have commments back by end of day Wednesday, December 31
Passed a-full on autobuilder:
https://autobuilder.yoctoproject.org/valkyrie/#/builders/29/builds/2954
The following changes since commit dccb7a185fe58a97f33e219b4db283ff4a2071d7:
cross.bbclass: Propagate dependencies to outhash (2025-12-23 06:28:05 -0800)
are available in the Git repository at:
https://git.openembedded.org/openembedded-core-contrib stable/scarthgap-nut
https://git.openembedded.org/openembedded-core-contrib/log/?h=stable/scarthgap-nut
Changqing Li (1):
libsoup: fix CVE-2025-12105
Jiaying Song (1):
grub: fix CVE-2025-54770 CVE-2025-61661 CVE-2025-61662 CVE-2025-61663
CVE-2025-61664
Vijay Anusuri (3):
go: Update CVE-2025-58187
go: Fix CVE-2025-61727
go: Fix CVE-2025-61729
.../grub/files/CVE-2025-54770.patch | 41 ++
.../grub/files/CVE-2025-61661.patch | 40 ++
.../grub/files/CVE-2025-61662.patch | 72 +++
.../grub/files/CVE-2025-61663_61664.patch | 64 +++
meta/recipes-bsp/grub/grub2.inc | 4 +
meta/recipes-devtools/go/go-1.22.12.inc | 5 +-
...025-58187.patch => CVE-2025-58187-1.patch} | 0
.../go/go/CVE-2025-58187-2.patch | 516 ++++++++++++++++++
.../go/go/CVE-2025-61727.patch | 226 ++++++++
.../go/go/CVE-2025-61729.patch | 174 ++++++
.../libsoup-3.4.4/CVE-2025-12105.patch | 34 ++
meta/recipes-support/libsoup/libsoup_3.4.4.bb | 1 +
12 files changed, 1176 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-bsp/grub/files/CVE-2025-54770.patch
create mode 100644 meta/recipes-bsp/grub/files/CVE-2025-61661.patch
create mode 100644 meta/recipes-bsp/grub/files/CVE-2025-61662.patch
create mode 100644 meta/recipes-bsp/grub/files/CVE-2025-61663_61664.patch
rename meta/recipes-devtools/go/go/{CVE-2025-58187.patch => CVE-2025-58187-1.patch} (100%)
create mode 100644 meta/recipes-devtools/go/go/CVE-2025-58187-2.patch
create mode 100644 meta/recipes-devtools/go/go/CVE-2025-61727.patch
create mode 100644 meta/recipes-devtools/go/go/CVE-2025-61729.patch
create mode 100644 meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2025-12105.patchSignature · 1 line
2.43.0
PATCH 1/5 grub: fix CVE-2025-54770 CVE-2025-61661 CVE-2025-61662 CVE-2025-61663 CVE-2025-61664
From: Jiaying Song <[email protected]>
References:
https://nvd.nist.gov/vuln/detail/CVE-2025-54770
https://nvd.nist.gov/vuln/detail/CVE-2025-61661
https://nvd.nist.gov/vuln/detail/CVE-2025-61662
https://nvd.nist.gov/vuln/detail/CVE-2025-61663
https://nvd.nist.gov/vuln/detail/CVE-2025-61664
--- .../grub/files/CVE-2025-54770.patch | 41 +++++++++++ .../grub/files/CVE-2025-61661.patch | 40 +++++++++++ .../grub/files/CVE-2025-61662.patch | 72 +++++++++++++++++++ .../grub/files/CVE-2025-61663_61664.patch | 64 +++++++++++++++++ meta/recipes-bsp/grub/grub2.inc | 4 ++ 5 files changed, 221 insertions(+) create mode 100644 meta/recipes-bsp/grub/files/CVE-2025-54770.patch create mode 100644 meta/recipes-bsp/grub/files/CVE-2025-61661.patch create mode 100644 meta/recipes-bsp/grub/files/CVE-2025-61662.patch create mode 100644 meta/recipes-bsp/grub/files/CVE-2025-61663_61664.patch
meta/recipes-bsp/grub/files/CVE-2025-54770.patch new file +41 -0
@@ -0,0 +1,41 @@ +From 80e0e9b2558c40fb108ae7a869362566eb4c1ead Mon Sep 17 00:00:00 2001 +From: Thomas Frauendorfer | Miray Software <[email protected]> +Date: Fri, 9 May 2025 14:20:47 +0200 +Subject: [PATCH] net/net: Unregister net_set_vlan command on unload + +The commit 954c48b9c (net/net: Add net_set_vlan command) added command +net_set_vlan to the net module. Unfortunately the commit only added the +grub_register_command() call on module load but missed the +grub_unregister_command() on unload. Let's fix this. + +Fixes: CVE-2025-54770 +Fixes: 954c48b9c (net/net: Add net_set_vlan command) + +CVE: CVE-2025-54770 + +Upstream-Status: Backport +[https://gitweb.git.savannah.gnu.org/gitweb/?p=grub.git;a=commit;h=10e58a14db20e17d1b6a39abe38df01fef98e29d] + +Reported-by: Thomas Frauendorfer | Miray Software <[email protected]> +Signed-off-by: Thomas Frauendorfer | Miray Software <[email protected]> +Reviewed-by: Daniel Kiper <[email protected]> +Signed-off-by: Jiaying Song <[email protected]> +--- + grub-core/net/net.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/grub-core/net/net.c b/grub-core/net/net.c +index 2b45c27d1..05f11be08 100644 +--- a/grub-core/net/net.c ++++ b/grub-core/net/net.c +@@ -2080,6 +2080,7 @@ GRUB_MOD_FINI(net) + grub_unregister_command (cmd_deladdr); + grub_unregister_command (cmd_addroute); + grub_unregister_command (cmd_delroute); ++ grub_unregister_command (cmd_setvlan); + grub_unregister_command (cmd_lsroutes); + grub_unregister_command (cmd_lscards); + grub_unregister_command (cmd_lsaddr); +-- +2.34.1 +
meta/recipes-bsp/grub/files/CVE-2025-61661.patch new file +40 -0
@@ -0,0 +1,40 @@ +From c24e11d87f8ee8cefd615e0c30eb71ff6149ee50 Mon Sep 17 00:00:00 2001 +From: Jamie <[email protected]> +Date: Mon, 14 Jul 2025 09:52:59 +0100 +Subject: [PATCH 2/4] commands/usbtest: Use correct string length field + +An incorrect length field is used for buffer allocation. This leads to +grub_utf16_to_utf8() receiving an incorrect/different length and possibly +causing OOB write. This makes sure to use the correct length. + +Fixes: CVE-2025-61661 + +CVE: CVE-2025-61661 + +Upstream-Status: Backport +[https://gitweb.git.savannah.gnu.org/gitweb/?p=grub.git;a=commit;h=549a9cc372fd0b96a4ccdfad0e12140476cc62a3] + +Reported-by: Jamie <[email protected]> +Signed-off-by: Jamie <[email protected]> +Reviewed-by: Daniel Kiper <[email protected]> +Signed-off-by: Jiaying Song <[email protected]> +--- + grub-core/commands/usbtest.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/grub-core/commands/usbtest.c b/grub-core/commands/usbtest.c +index 2c6d93fe6..8ef187a9a 100644 +--- a/grub-core/commands/usbtest.c ++++ b/grub-core/commands/usbtest.c +@@ -99,7 +99,7 @@ grub_usb_get_string (grub_usb_device_t dev, grub_uint8_t index, int langid, + return GRUB_USB_ERR_NONE; + } + +- *string = grub_malloc (descstr.length * 2 + 1); ++ *string = grub_malloc (descstrp->length * 2 + 1); + if (! *string) + { + grub_free (descstrp); +-- +2.34.1 +
meta/recipes-bsp/grub/files/CVE-2025-61662.patch new file +72 -0
72 lines not on this page · raw message
meta/recipes-bsp/grub/files/CVE-2025-61663_61664.patch new file +64 -0
64 lines not on this page · raw message
meta/recipes-bsp/grub/grub2.inc +4 -0
@@ -38,6 +38,10 @@ SRC_URI = "${GNU_MIRROR}/grub/grub-${PV}.tar.gz \ file://CVE-2025-0677_CVE-2025-0684_CVE-2025-0685_CVE-2025-0686_CVE-2025-0689.patch \ file://CVE-2025-0678_CVE-2025-1125.patch \ file://CVE-2024-56738.patch \ + file://CVE-2025-54770.patch \ + file://CVE-2025-61661.patch \ + file://CVE-2025-61662.patch \ + file://CVE-2025-61663_61664.patch \ " SRC_URI[sha256sum] = "b30919fa5be280417c17ac561bb1650f60cfb80cc6237fa1e2b6f56154cb9c91"
Signature · 1 line
2.43.0
PATCH 2/5 libsoup: fix CVE-2025-12105
In reply to Steve SakomanFrom: Changqing Li <[email protected]>
Refer:
https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/481
--- .../libsoup-3.4.4/CVE-2025-12105.patch | 34 +++++++++++++++++++ meta/recipes-support/libsoup/libsoup_3.4.4.bb | 1 + 2 files changed, 35 insertions(+) create mode 100644 meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2025-12105.patch
meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2025-12105.patch new file +34 -0
@@ -0,0 +1,34 @@ +From 4cbb31f5bf083442325692ff16559fed73f3a6cf Mon Sep 17 00:00:00 2001 +From: Eugene Mutavchi <[email protected]> +Date: Fri, 10 Oct 2025 16:24:27 +0000 +Subject: [PATCH] fix 'heap-use-after-free' caused by 'finishing' queue item + twice + +CVE: CVE-2025-12105 +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/9ba1243a24e442fa5ec44684617a4480027da960] + +Signed-off-by: Changqing Li <[email protected]> +--- + libsoup/soup-session.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/libsoup/soup-session.c b/libsoup/soup-session.c +index 9f00b05..649902f 100644 +--- a/libsoup/soup-session.c ++++ b/libsoup/soup-session.c +@@ -2822,8 +2822,10 @@ run_until_read_done (SoupMessage *msg, + if (soup_message_io_in_progress (msg)) + soup_message_io_finished (msg); + item->paused = FALSE; +- item->state = SOUP_MESSAGE_FINISHING; +- soup_session_process_queue_item (item->session, item, FALSE); ++ if (item->state != SOUP_MESSAGE_FINISHED) { ++ item->state = SOUP_MESSAGE_FINISHING; ++ soup_session_process_queue_item (item->session, item, FALSE); ++ } + } + async_send_request_return_result (item, NULL, error); + } +-- +2.34.1 +
meta/recipes-support/libsoup/libsoup_3.4.4.bb +1 -0
@@ -45,6 +45,7 @@ SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz \ file://CVE-2025-4948.patch \ file://CVE-2025-2784.patch \ file://CVE-2025-4945.patch \ + file://CVE-2025-12105.patch \ " SRC_URI[sha256sum] = "291c67725f36ed90ea43efff25064b69c5a2d1981488477c05c481a3b4b0c5aa"
Signature · 1 line
2.43.0
PATCH 3/5 go: Update CVE-2025-58187
In reply to Steve SakomanFrom: Vijay Anusuri <[email protected]>
Upstream-Status: Backport from https://github.com/golang/go/commit/ca6a5545ba18844a97c88a90a385eb6335bb7526
---
meta/recipes-devtools/go/go-1.22.12.inc | 3 +-
...025-58187.patch => CVE-2025-58187-1.patch} | 0
.../go/go/CVE-2025-58187-2.patch | 516 ++++++++++++++++++
3 files changed, 518 insertions(+), 1 deletion(-)
rename meta/recipes-devtools/go/go/{CVE-2025-58187.patch => CVE-2025-58187-1.patch} (100%)
create mode 100644 meta/recipes-devtools/go/go/CVE-2025-58187-2.patchmeta/recipes-devtools/go/go-1.22.12.inc +2 -1
@@ -22,7 +22,8 @@ SRC_URI += "\ file://CVE-2025-47907.patch \ file://CVE-2025-47906.patch \ file://CVE-2025-58185.patch \ - file://CVE-2025-58187.patch \ + file://CVE-2025-58187-1.patch \ + file://CVE-2025-58187-2.patch \ file://CVE-2025-58188.patch \ file://CVE-2025-58189.patch \ file://CVE-2025-47912.patch \
meta/recipes-devtools/go/go/CVE-2025-58187-1.patch renamed from meta/recipes-devtools/go/go/CVE-2025-58187.patch +0 -0
meta/recipes-devtools/go/go/CVE-2025-58187-2.patch new file +516 -0
516 lines not on this page · raw message
Signature · 1 line
2.43.0
PATCH 4/5 go: Fix CVE-2025-61727
In reply to Steve SakomanFrom: Vijay Anusuri <[email protected]>
Upstream-Status: Backport from https://github.com/golang/go/commit/04db77a423cac75bb82cc9a6859991ae9c016344
--- meta/recipes-devtools/go/go-1.22.12.inc | 1 + .../go/go/CVE-2025-61727.patch | 226 ++++++++++++++++++ 2 files changed, 227 insertions(+) create mode 100644 meta/recipes-devtools/go/go/CVE-2025-61727.patch
meta/recipes-devtools/go/go-1.22.12.inc +1 -0
@@ -29,6 +29,7 @@ SRC_URI += "\ file://CVE-2025-47912.patch \ file://CVE-2025-61723.patch \ file://CVE-2025-61724.patch \ + file://CVE-2025-61727.patch \ " SRC_URI[main.sha256sum] = "012a7e1f37f362c0918c1dfa3334458ac2da1628c4b9cf4d9ca02db986e17d71"
meta/recipes-devtools/go/go/CVE-2025-61727.patch new file +226 -0
226 lines not on this page · raw message
Signature · 1 line
2.43.0
PATCH 5/5 go: Fix CVE-2025-61729
In reply to Steve SakomanFrom: Vijay Anusuri <[email protected]>
Upstream-Status: Backport from https://github.com/golang/go/commit/3a842bd5c6aa8eefa13c0174de3ab361e50bd672
--- meta/recipes-devtools/go/go-1.22.12.inc | 1 + .../go/go/CVE-2025-61729.patch | 174 ++++++++++++++++++ 2 files changed, 175 insertions(+) create mode 100644 meta/recipes-devtools/go/go/CVE-2025-61729.patch
meta/recipes-devtools/go/go-1.22.12.inc +1 -0
@@ -30,6 +30,7 @@ SRC_URI += "\ file://CVE-2025-61723.patch \ file://CVE-2025-61724.patch \ file://CVE-2025-61727.patch \ + file://CVE-2025-61729.patch \ " SRC_URI[main.sha256sum] = "012a7e1f37f362c0918c1dfa3334458ac2da1628c4b9cf4d9ca02db986e17d71"
meta/recipes-devtools/go/go/CVE-2025-61729.patch new file +174 -0
174 lines not on this page · raw message
Signature · 1 line
2.43.0