Patch review
cover Patch review
Please review this set of changes for scarthgap and have comments back by end of day Friday, May 30
Passed a-full on autobuilder:
https://autobuilder.yoctoproject.org/valkyrie/#/builders/29/builds/1672
The following changes since commit 29d920f4c2249df7a69f00100924b4525e03c0d9:
libatomic-ops: Update GITHUB_BASE_URI (2025-05-20 08:59:39 -0700)
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
Ashish Sharma (1):
libsoup: patch CVE-2025-4476
Divya Chellam (1):
ruby: fix CVE-2025-27221
Divyanshu Rathore (1):
ffmpeg: upgrade 6.1.1 -> 6.1.2
Harish Sadineni (2):
binutils: Fix CVE-2025-1179
binutils: set CVE_STATUS for CVE-2025-1180
Rogerio Guerra Borin (1):
u-boot: ensure keys are generated before assembling U-Boot FIT image
Vijay Anusuri (4):
libsoup-2.4: Fix CVE-2025-32910 libsoup-2.4: Fix CVE-2025-32911 & CVE-2025-32913 libsoup-2.4: Fix CVE-2025-32912 libsoup-2.4: Fix CVE-2025-32914
Virendra Thakur (1):
util-linux: Add fix to isolate test fstab entries using CUSTOM_FSTAB
meta/classes-recipe/uboot-sign.bbclass | 2 +
meta/recipes-core/util-linux/util-linux.inc | 1 +
.../util-linux/fstab-isolation.patch | 448 +++++++
.../binutils/binutils-2.42.inc | 3 +
.../binutils/binutils/CVE-2025-1179-pre.patch | 1086 +++++++++++++++++
.../binutils/binutils/CVE-2025-1179.patch | 269 ++++
.../ruby/ruby/CVE-2025-27221-0001.patch | 57 +
.../ruby/ruby/CVE-2025-27221-0002.patch | 73 ++
meta/recipes-devtools/ruby/ruby_3.3.5.bb | 2 +
.../ffmpeg/ffmpeg/CVE-2024-32230.patch | 36 -
.../ffmpeg/ffmpeg/CVE-2024-35366.patch | 35 -
.../ffmpeg/ffmpeg/CVE-2024-36613.patch | 37 -
.../ffmpeg/ffmpeg/CVE-2024-36616.patch | 35 -
.../ffmpeg/ffmpeg/CVE-2024-36617.patch | 36 -
.../ffmpeg/ffmpeg/CVE-2024-36619.patch | 36 -
.../ffmpeg/ffmpeg/CVE-2024-7055.patch | 38 -
.../ffmpeg/ffmpeg/vulkan_av1_stable_API.patch | 40 +-
.../{ffmpeg_6.1.1.bb => ffmpeg_6.1.2.bb} | 9 +-
.../libsoup-2.4/CVE-2025-32910-1.patch | 97 ++
.../libsoup-2.4/CVE-2025-32910-2.patch | 148 +++
.../libsoup-2.4/CVE-2025-32910-3.patch | 26 +
.../CVE-2025-32911_CVE-2025-32913-1.patch | 72 ++
.../CVE-2025-32911_CVE-2025-32913-2.patch | 44 +
.../libsoup-2.4/CVE-2025-32912-1.patch | 41 +
.../libsoup-2.4/CVE-2025-32912-2.patch | 30 +
.../libsoup/libsoup-2.4/CVE-2025-32914.patch | 137 +++
.../libsoup/libsoup-2.4_2.74.3.bb | 8 +
.../libsoup/libsoup-3.4.4/CVE-2025-4476.patch | 38 +
meta/recipes-support/libsoup/libsoup_3.4.4.bb | 1 +
29 files changed, 2604 insertions(+), 281 deletions(-)
create mode 100644 meta/recipes-core/util-linux/util-linux/fstab-isolation.patch
create mode 100644 meta/recipes-devtools/binutils/binutils/CVE-2025-1179-pre.patch
create mode 100644 meta/recipes-devtools/binutils/binutils/CVE-2025-1179.patch
create mode 100644 meta/recipes-devtools/ruby/ruby/CVE-2025-27221-0001.patch
create mode 100644 meta/recipes-devtools/ruby/ruby/CVE-2025-27221-0002.patch
delete mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-32230.patch
delete mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-35366.patch
delete mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-36613.patch
delete mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-36616.patch
delete mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-36617.patch
delete mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-36619.patch
delete mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-7055.patch
rename meta/recipes-multimedia/ffmpeg/{ffmpeg_6.1.1.bb => ffmpeg_6.1.2.bb} (96%)
create mode 100644 meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32910-1.patch
create mode 100644 meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32910-2.patch
create mode 100644 meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32910-3.patch
create mode 100644 meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32911_CVE-2025-32913-1.patch
create mode 100644 meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32911_CVE-2025-32913-2.patch
create mode 100644 meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32912-1.patch
create mode 100644 meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32912-2.patch
create mode 100644 meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32914.patch
create mode 100644 meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2025-4476.patchSignature · 1 line
2.43.0
PATCH 1/11 libsoup-2.4: Fix CVE-2025-32910
From: Vijay Anusuri <[email protected]>
import patch from debian to fix
CVE-2025-32910
Upstream-Status: Backport [import from debian https://salsa.debian.org/gnome-team/libsoup/-/tree/debian/bullseye/debian/patches?ref_type=heads
Upstream commit https://gitlab.gnome.org/GNOME/libsoup/-/commit/e40df6d48a1cbab56f5d15016cc861a503423cfe
&
https://gitlab.gnome.org/GNOME/libsoup/-/commit/405a8a34597a44bd58c4759e7d5e23f02c3b556a
&
https://gitlab.gnome.org/GNOME/libsoup/-/commit/ea16eeacb052e423eb5c3b0b705e5eab34b13832]
Reference:
https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/417
https://security-tracker.debian.org/tracker/CVE-2025-32910
--- .../libsoup-2.4/CVE-2025-32910-1.patch | 97 ++++++++++++ .../libsoup-2.4/CVE-2025-32910-2.patch | 148 ++++++++++++++++++ .../libsoup-2.4/CVE-2025-32910-3.patch | 26 +++ .../libsoup/libsoup-2.4_2.74.3.bb | 3 + 4 files changed, 274 insertions(+) create mode 100644 meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32910-1.patch create mode 100644 meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32910-2.patch create mode 100644 meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32910-3.patch
meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32910-1.patch new file +97 -0
@@ -0,0 +1,97 @@ +From: Patrick Griffis <[email protected]> +Date: Sun, 8 Dec 2024 20:00:35 -0600 +Subject: auth-digest: Handle missing realm in authenticate header + +(cherry picked from commit e40df6d48a1cbab56f5d15016cc861a503423cfe) + +Upstream-Status: Backport [import from debian https://salsa.debian.org/gnome-team/libsoup/-/blob/debian/bullseye/debian/patches/CVE-2025-32910-1.patch?ref_type=heads +Upstream commit https://gitlab.gnome.org/GNOME/libsoup/-/commit/e40df6d48a1cbab56f5d15016cc861a503423cfe] +CVE: CVE-2025-32910 +Signed-off-by: Vijay Anusuri <[email protected]> +--- + libsoup/soup-auth-digest.c | 3 +++ + tests/auth-test.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 53 insertions(+) + +diff --git a/libsoup/soup-auth-digest.c b/libsoup/soup-auth-digest.c +index e8ba990..263a15a 100644 +--- a/libsoup/soup-auth-digest.c ++++ b/libsoup/soup-auth-digest.c +@@ -142,6 +142,9 @@ soup_auth_digest_update (SoupAuth *auth, SoupMessage *msg, + guint qop_options; + gboolean ok = TRUE; + ++ if (!soup_auth_get_realm (auth)) ++ return FALSE; ++ + g_free (priv->domain); + g_free (priv->nonce); + g_free (priv->opaque); +diff --git a/tests/auth-test.c b/tests/auth-test.c +index 8295ec3..dfc6b09 100644 +--- a/tests/auth-test.c ++++ b/tests/auth-test.c +@@ -1549,6 +1549,55 @@ do_cancel_after_retry_test (void) + soup_test_session_abort_unref (session); + } + ++static void ++on_request_read_for_missing_realm (SoupServer *server, ++ SoupServerMessage *msg, ++ gpointer user_data) ++{ ++ SoupMessageHeaders *response_headers = soup_server_message_get_response_headers (msg); ++ soup_message_headers_replace (response_headers, "WWW-Authenticate", "Digest qop=\"auth\""); ++} ++ ++static void ++do_missing_realm_test (void) ++{ ++ SoupSession *session; ++ SoupMessage *msg; ++ SoupServer *server; ++ SoupAuthDomain *digest_auth_domain; ++ gint status; ++ GUri *uri; ++ ++ server = soup_test_server_new (SOUP_TEST_SERVER_IN_THREAD); ++ soup_server_add_handler (server, NULL, ++ server_callback, NULL, NULL); ++ uri = soup_test_server_get_uri (server, "http", NULL); ++ ++ digest_auth_domain = soup_auth_domain_digest_new ( ++ "realm", "auth-test", ++ "auth-callback", server_digest_auth_callback, ++ NULL); ++ soup_auth_domain_add_path (digest_auth_domain, "/"); ++ soup_server_add_auth_domain (server, digest_auth_domain); ++ g_object_unref (digest_auth_domain); ++ ++ g_signal_connect (server, "request-read", ++ G_CALLBACK (on_request_read_for_missing_realm), ++ NULL); ++ ++ session = soup_test_session_new (NULL); ++ msg = soup_message_new_from_uri ("GET", uri); ++ g_signal_connect (msg, "authenticate", ++ G_CALLBACK (on_digest_authenticate), ++ NULL); ++ ++ status = soup_test_session_send_message (session, msg); ++ ++ g_assert_cmpint (status, ==, SOUP_STATUS_UNAUTHORIZED); ++ g_uri_unref (uri); ++ soup_test_server_quit_unref (server); ++} ++ + int + main (int argc, char **argv) + { +@@ -1576,6 +1625,7 @@ main (int argc, char **argv) + g_test_add_func ("/auth/async-message-do-not-use-auth-cache", do_async_message_do_not_use_auth_cache_test); + g_test_add_func ("/auth/authorization-header-request", do_message_has_authorization_header_test); + g_test_add_func ("/auth/cancel-after-retry", do_cancel_after_retry_test); ++ g_test_add_func ("/auth/missing-realm", do_missing_realm_test); + + ret = g_test_run (); +
meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32910-2.patch new file +148 -0
148 lines not on this page · raw message
meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32910-3.patch new file +26 -0
@@ -0,0 +1,26 @@ +From: Patrick Griffis <[email protected]> +Date: Fri, 27 Dec 2024 13:52:52 -0600 +Subject: auth-digest: Fix leak + +(cherry picked from commit ea16eeacb052e423eb5c3b0b705e5eab34b13832) + +Upstream-Status: Backport [import from debian https://salsa.debian.org/gnome-team/libsoup/-/blob/debian/bullseye/debian/patches/CVE-2025-32910-3.patch?ref_type=heads +Upstream commit https://gitlab.gnome.org/GNOME/libsoup/-/commit/ea16eeacb052e423eb5c3b0b705e5eab34b13832] +CVE: CVE-2025-32910 +Signed-off-by: Vijay Anusuri <[email protected]> +--- + libsoup/soup-auth-digest.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libsoup/soup-auth-digest.c b/libsoup/soup-auth-digest.c +index 393adb6..a1db188 100644 +--- a/libsoup/soup-auth-digest.c ++++ b/libsoup/soup-auth-digest.c +@@ -66,6 +66,7 @@ soup_auth_digest_finalize (GObject *object) + g_free (priv->nonce); + g_free (priv->domain); + g_free (priv->cnonce); ++ g_free (priv->opaque); + + memset (priv->hex_urp, 0, sizeof (priv->hex_urp)); + memset (priv->hex_a1, 0, sizeof (priv->hex_a1));
meta/recipes-support/libsoup/libsoup-2.4_2.74.3.bb +3 -0
@@ -23,6 +23,9 @@ SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz \ file://CVE-2025-32906-2.patch \ file://CVE-2025-32909.patch \ file://CVE-2025-46420.patch \ + file://CVE-2025-32910-1.patch \ + file://CVE-2025-32910-2.patch \ + file://CVE-2025-32910-3.patch \ " SRC_URI[sha256sum] = "e4b77c41cfc4c8c5a035fcdc320c7bc6cfb75ef7c5a034153df1413fa1d92f13"
Signature · 1 line
2.43.0
PATCH 2/11 libsoup-2.4: Fix CVE-2025-32911 & CVE-2025-32913
In reply to Steve SakomanFrom: Vijay Anusuri <[email protected]>
Upstream-Status: Backport from
https://gitlab.gnome.org/GNOME/libsoup/-/commit/7b4ef0e004ece3a308ccfaa714c284f4c96ade34
& https://gitlab.gnome.org/GNOME/libsoup/-/commit/f4a761fb66512fff59798765e8ac5b9e57dceef0
--- .../CVE-2025-32911_CVE-2025-32913-1.patch | 72 +++++++++++++++++++ .../CVE-2025-32911_CVE-2025-32913-2.patch | 44 ++++++++++++ .../libsoup/libsoup-2.4_2.74.3.bb | 2 + 3 files changed, 118 insertions(+) create mode 100644 meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32911_CVE-2025-32913-1.patch create mode 100644 meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32911_CVE-2025-32913-2.patch
meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32911_CVE-2025-32913-1.patch new file +72 -0
@@ -0,0 +1,72 @@ +From 7b4ef0e004ece3a308ccfaa714c284f4c96ade34 Mon Sep 17 00:00:00 2001 +From: Patrick Griffis <[email protected]> +Date: Fri, 27 Dec 2024 17:53:50 -0600 +Subject: [PATCH] soup_message_headers_get_content_disposition: Fix NULL deref + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/7b4ef0e004ece3a308ccfaa714c284f4c96ade34] +CVE: CVE-2025-32911 CVE-2025-32913 #Dependency Patch +Signed-off-by: Vijay Anusuri <[email protected]> +--- + libsoup/soup-message-headers.c | 13 +++++++++---- + tests/header-parsing-test.c | 14 ++++++++++++++ + 2 files changed, 23 insertions(+), 4 deletions(-) + +diff --git a/libsoup/soup-message-headers.c b/libsoup/soup-message-headers.c +index 56cc1e9d..04f4c302 100644 +--- a/libsoup/soup-message-headers.c ++++ b/libsoup/soup-message-headers.c +@@ -1660,10 +1660,15 @@ soup_message_headers_get_content_disposition (SoupMessageHeaders *hdrs, + */ + if (params && g_hash_table_lookup_extended (*params, "filename", + &orig_key, &orig_value)) { +- char *filename = strrchr (orig_value, '/'); +- +- if (filename) +- g_hash_table_insert (*params, g_strdup (orig_key), filename + 1); ++ if (orig_value) { ++ char *filename = strrchr (orig_value, '/'); ++ ++ if (filename) ++ g_hash_table_insert (*params, g_strdup (orig_key), filename + 1); ++ } else { ++ /* filename with no value isn't valid. */ ++ g_hash_table_remove (*params, "filename"); ++ } + } + return TRUE; + } +diff --git a/tests/header-parsing-test.c b/tests/header-parsing-test.c +index 5e423d2b..d0b360c8 100644 +--- a/tests/header-parsing-test.c ++++ b/tests/header-parsing-test.c +@@ -1039,6 +1039,7 @@ do_param_list_tests (void) + #define RFC5987_TEST_HEADER_FALLBACK "attachment; filename*=Unknown''t%FF%FF%FFst.txt; filename=\"test.txt\"" + #define RFC5987_TEST_HEADER_NO_TYPE "filename=\"test.txt\"" + #define RFC5987_TEST_HEADER_NO_TYPE_2 "filename=\"test.txt\"; foo=bar" ++#define RFC5987_TEST_HEADER_EMPTY_FILENAME ";filename" + + static void + do_content_disposition_tests (void) +@@ -1139,6 +1140,19 @@ do_content_disposition_tests (void) + g_assert_cmpstr (parameter2, ==, "bar"); + g_hash_table_destroy (params); + ++ /* Empty filename */ ++ soup_message_headers_clear (hdrs); ++ soup_message_headers_append (hdrs, "Content-Disposition", ++ RFC5987_TEST_HEADER_EMPTY_FILENAME); ++ if (!soup_message_headers_get_content_disposition (hdrs, ++ &disposition, ++ ¶ms)) { ++ soup_test_assert (FALSE, "empty filename decoding FAILED"); ++ return; ++ } ++ g_assert_false (g_hash_table_contains (params, "filename")); ++ g_hash_table_destroy (params); ++ + soup_message_headers_free (hdrs); + + /* Ensure that soup-multipart always quotes filename */ +-- +GitLab +
meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32911_CVE-2025-32913-2.patch new file +44 -0
44 lines not on this page · raw message
meta/recipes-support/libsoup/libsoup-2.4_2.74.3.bb +2 -0
@@ -26,6 +26,8 @@ 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-32911_CVE-2025-32913-1.patch \ + file://CVE-2025-32911_CVE-2025-32913-2.patch \ " SRC_URI[sha256sum] = "e4b77c41cfc4c8c5a035fcdc320c7bc6cfb75ef7c5a034153df1413fa1d92f13"
Signature · 1 line
2.43.0
PATCH 3/11 libsoup-2.4: Fix CVE-2025-32912
In reply to Steve SakomanFrom: Vijay Anusuri <[email protected]>
Upstream-Status: Backport from
https://gitlab.gnome.org/GNOME/libsoup/-/commit/cd077513f267e43ce4b659eb18a1734d8a369992
& https://gitlab.gnome.org/GNOME/libsoup/-/commit/910ebdcd3dd82386717a201c13c834f3a63eed7f
--- .../libsoup-2.4/CVE-2025-32912-1.patch | 41 +++++++++++++++++++ .../libsoup-2.4/CVE-2025-32912-2.patch | 30 ++++++++++++++ .../libsoup/libsoup-2.4_2.74.3.bb | 2 + 3 files changed, 73 insertions(+) create mode 100644 meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32912-1.patch create mode 100644 meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32912-2.patch
meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32912-1.patch new file +41 -0
@@ -0,0 +1,41 @@ +From cd077513f267e43ce4b659eb18a1734d8a369992 Mon Sep 17 00:00:00 2001 +From: Patrick Griffis <[email protected]> +Date: Wed, 5 Feb 2025 14:03:05 -0600 +Subject: [PATCH 1/2] auth-digest: Handle missing nonce + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/cd077513f267e43ce4b659eb18a1734d8a369992] +CVE: CVE-2025-32912 +Signed-off-by: Vijay Anusuri <[email protected]> +--- + libsoup/soup-auth-digest.c | 2 +- + tests/auth-test.c | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/libsoup/soup-auth-digest.c b/libsoup/soup-auth-digest.c +index a1db188..f0edb81 100644 +--- a/libsoup/soup-auth-digest.c ++++ b/libsoup/soup-auth-digest.c +@@ -156,7 +156,7 @@ soup_auth_digest_update (SoupAuth *auth, SoupMessage *msg, + guint qop_options; + gboolean ok = TRUE; + +- if (!soup_auth_get_realm (auth)) ++ if (!soup_auth_get_realm (auth) || !g_hash_table_contains (auth_params, "nonce")) + return FALSE; + + g_free (priv->domain); +diff --git a/tests/auth-test.c b/tests/auth-test.c +index 6fb1e4a..343d7a5 100644 +--- a/tests/auth-test.c ++++ b/tests/auth-test.c +@@ -1629,6 +1629,7 @@ main (int argc, char **argv) + g_test_add_data_func ("/auth/missing-params/realm", "Digest qop=\"auth\"", do_missing_params_test); + g_test_add_data_func ("/auth/missing-params/nonce", "Digest realm=\"auth-test\", qop=\"auth,auth-int\", opaque=\"5ccc069c403ebaf9f0171e9517f40e41\"", do_missing_params_test); + g_test_add_data_func ("/auth/missing-params/nonce-md5-sess", "Digest realm=\"auth-test\", qop=\"auth,auth-int\", opaque=\"5ccc069c403ebaf9f0171e9517f40e41\" algorithm=\"MD5-sess\"", do_missing_params_test); ++ g_test_add_data_func ("/auth/missing-params/nonce-and-qop", "Digest realm=\"auth-test\"", do_missing_params_test); + + ret = g_test_run (); + +-- +2.25.1 +
meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32912-2.patch new file +30 -0
@@ -0,0 +1,30 @@ +From 910ebdcd3dd82386717a201c13c834f3a63eed7f Mon Sep 17 00:00:00 2001 +From: Patrick Griffis <[email protected]> +Date: Sat, 8 Feb 2025 12:30:13 -0600 +Subject: [PATCH 2/2] digest-auth: Handle NULL nonce + +`contains` only handles a missing nonce, `lookup` handles both missing and empty. + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/910ebdcd3dd82386717a201c13c834f3a63eed7f] +CVE: CVE-2025-32912 +Signed-off-by: Vijay Anusuri <[email protected]> +--- + libsoup/soup-auth-digest.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libsoup/soup-auth-digest.c b/libsoup/soup-auth-digest.c +index f0edb81..c49ffd9 100644 +--- a/libsoup/soup-auth-digest.c ++++ b/libsoup/soup-auth-digest.c +@@ -156,7 +156,7 @@ soup_auth_digest_update (SoupAuth *auth, SoupMessage *msg, + guint qop_options; + gboolean ok = TRUE; + +- if (!soup_auth_get_realm (auth) || !g_hash_table_contains (auth_params, "nonce")) ++ if (!soup_auth_get_realm (auth) || !g_hash_table_lookup (auth_params, "nonce")) + return FALSE; + + g_free (priv->domain); +-- +2.25.1 +
meta/recipes-support/libsoup/libsoup-2.4_2.74.3.bb +2 -0
@@ -28,6 +28,8 @@ SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz \ file://CVE-2025-32910-3.patch \ file://CVE-2025-32911_CVE-2025-32913-1.patch \ file://CVE-2025-32911_CVE-2025-32913-2.patch \ + file://CVE-2025-32912-1.patch \ + file://CVE-2025-32912-2.patch \ " SRC_URI[sha256sum] = "e4b77c41cfc4c8c5a035fcdc320c7bc6cfb75ef7c5a034153df1413fa1d92f13"
Signature · 1 line
2.43.0
PATCH 4/11 libsoup-2.4: Fix CVE-2025-32914
In reply to Steve SakomanFrom: Vijay Anusuri <[email protected]>
import patch from debian to fix
CVE-2025-32914
Upstream-Status: Backport [import from debian https://salsa.debian.org/gnome-team/libsoup/-/tree/debian/bullseye/debian/patches?ref_type=heads
Upstream commit https://gitlab.gnome.org/GNOME/libsoup/-/commit/5bfcf8157597f2d327050114fb37ff600004dbcf]
Reference:
https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/450
https://security-tracker.debian.org/tracker/CVE-2025-32914
--- .../libsoup/libsoup-2.4/CVE-2025-32914.patch | 137 ++++++++++++++++++ .../libsoup/libsoup-2.4_2.74.3.bb | 1 + 2 files changed, 138 insertions(+) create mode 100644 meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32914.patch
meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32914.patch new file +137 -0
@@ -0,0 +1,137 @@ +From: Milan Crha <[email protected]> +Date: Tue, 15 Apr 2025 09:03:00 +0200 +Subject: multipart: Fix read out of buffer bounds under + soup_multipart_new_from_message() + +This is CVE-2025-32914, special crafted input can cause read out of buffer bounds +of the body argument. + +Closes #436 + +(cherry picked from commit 5bfcf8157597f2d327050114fb37ff600004dbcf) + +Upstream-Status: Backport [import from debian https://salsa.debian.org/gnome-team/libsoup/-/blob/debian/bullseye/debian/patches/CVE-2025-32914.patch?ref_type=heads +Upstream commit https://gitlab.gnome.org/GNOME/libsoup/-/commit/5bfcf8157597f2d327050114fb37ff600004dbcf] +CVE: CVE-2025-32914 +Signed-off-by: Vijay Anusuri <[email protected]> +--- + libsoup/soup-multipart.c | 2 +- + tests/multipart-test.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 86 insertions(+), 1 deletion(-) + +diff --git a/libsoup/soup-multipart.c b/libsoup/soup-multipart.c +index a7e550f..dd93973 100644 +--- a/libsoup/soup-multipart.c ++++ b/libsoup/soup-multipart.c +@@ -181,7 +181,7 @@ soup_multipart_new_from_message (SoupMessageHeaders *headers, + return NULL; + } + +- split = strstr (start, "\r\n\r\n"); ++ split = g_strstr_len (start, body_end - start, "\r\n\r\n"); + if (!split || split > end) { + soup_multipart_free (multipart); + soup_buffer_free (flattened); +diff --git a/tests/multipart-test.c b/tests/multipart-test.c +index 64a5ebf..834b181 100644 +--- a/tests/multipart-test.c ++++ b/tests/multipart-test.c +@@ -479,6 +479,89 @@ test_multipart (gconstpointer data) + g_main_loop_unref (loop); + } + ++static void ++test_multipart_bounds_good (void) ++{ ++ #define TEXT "line1\r\nline2" ++ SoupMultipart *multipart; ++ SoupMessageHeaders *headers, *set_headers = NULL; ++ //GBytes *bytes, *set_bytes = NULL; ++ GBytes *bytes; ++ const char *raw_data = "--123\r\nContent-Type: text/plain;\r\n\r\n" TEXT "\r\n--123--\r\n"; ++ gboolean success; ++ SoupMessageBody *body = soup_message_body_new (); ++ SoupBuffer *set_buffer = NULL; ++ gconstpointer data; ++ gsize size; ++ ++ headers = soup_message_headers_new (SOUP_MESSAGE_HEADERS_MULTIPART); ++ soup_message_headers_append (headers, "Content-Type", "multipart/mixed; boundary=\"123\""); ++ ++ bytes = g_bytes_new (raw_data, strlen (raw_data)); ++ ++ data = g_bytes_get_data(bytes, NULL); ++ size = g_bytes_get_size(bytes); ++ ++ soup_message_body_append(body, SOUP_MEMORY_STATIC, data, size); ++ ++ //multipart = soup_multipart_new_from_message (headers, bytes); ++ multipart = soup_multipart_new_from_message (headers, body); ++ ++ soup_message_body_free (body); ++ ++ g_assert_nonnull (multipart); ++ g_assert_cmpint (soup_multipart_get_length (multipart), ==, 1); ++ success = soup_multipart_get_part (multipart, 0, &set_headers, &set_buffer); ++ g_assert_true (success); ++ g_assert_nonnull (set_headers); ++ //g_assert_nonnull (set_bytes); ++ g_assert_nonnull (set_buffer); ++ //g_assert_cmpint (strlen (TEXT), ==, g_bytes_get_size (set_bytes)); ++ g_assert_cmpint (strlen (TEXT), ==, set_buffer->length); ++ g_assert_cmpstr ("text/plain", ==, soup_message_headers_get_content_type (set_headers, NULL)); ++ //g_assert_cmpmem (TEXT, strlen (TEXT), g_bytes_get_data (set_bytes, NULL), g_bytes_get_size (set_bytes)); ++ g_assert_cmpmem(TEXT, strlen(TEXT), set_buffer->data, set_buffer->length); ++ ++ soup_message_headers_free (headers); ++ g_bytes_unref (bytes); ++ ++ soup_multipart_free (multipart); ++ ++ #undef TEXT ++} ++ ++static void ++test_multipart_bounds_bad (void) ++{ ++ SoupMultipart *multipart; ++ SoupMessageHeaders *headers; ++ GBytes *bytes; ++ const char *raw_data = "--123\r\nContent-Type: text/plain;\r\nline1\r\nline2\r\n--123--\r\n"; ++ SoupMessageBody *body = soup_message_body_new (); ++ gconstpointer data; ++ gsize size; ++ ++ headers = soup_message_headers_new (SOUP_MESSAGE_HEADERS_MULTIPART); ++ soup_message_headers_append (headers, "Content-Type", "multipart/mixed; boundary=\"123\""); ++ ++ bytes = g_bytes_new (raw_data, strlen (raw_data)); ++ ++ data = g_bytes_get_data(bytes, NULL); ++ size = g_bytes_get_size(bytes); ++ ++ soup_message_body_append(body, SOUP_MEMORY_STATIC, data, size); ++ ++ /* it did read out of raw_data/bytes bounds */ ++ //multipart = soup_multipart_new_from_message (headers, bytes); ++ multipart = soup_multipart_new_from_message (headers, body); ++ g_assert_null (multipart); ++ ++ soup_message_body_free (body); ++ ++ soup_message_headers_free (headers); ++ g_bytes_unref (bytes); ++} ++ + int + main (int argc, char **argv) + { +@@ -508,6 +591,8 @@ main (int argc, char **argv) + g_test_add_data_func ("/multipart/sync", GINT_TO_POINTER (SYNC_MULTIPART), test_multipart); + g_test_add_data_func ("/multipart/async", GINT_TO_POINTER (ASYNC_MULTIPART), test_multipart); + g_test_add_data_func ("/multipart/async-small-reads", GINT_TO_POINTER (ASYNC_MULTIPART_SMALL_READS), test_multipart); ++ g_test_add_func ("/multipart/bounds-good", test_multipart_bounds_good); ++ g_test_add_func ("/multipart/bounds-bad", test_multipart_bounds_bad); + + ret = g_test_run (); +
meta/recipes-support/libsoup/libsoup-2.4_2.74.3.bb +1 -0
@@ -30,6 +30,7 @@ SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz \ file://CVE-2025-32911_CVE-2025-32913-2.patch \ file://CVE-2025-32912-1.patch \ file://CVE-2025-32912-2.patch \ + file://CVE-2025-32914.patch \ " SRC_URI[sha256sum] = "e4b77c41cfc4c8c5a035fcdc320c7bc6cfb75ef7c5a034153df1413fa1d92f13"
Signature · 1 line
2.43.0
PATCH 5/11 binutils: Fix CVE-2025-1179
In reply to Steve SakomanFrom: Harish Sadineni <[email protected]>
CVE-2025-1179-pre.patch is dependency patch for CVE-2025-1179.patch
Upstream-Status: Submitted [https://sourceware.org/pipermail/binutils/2025-May/141322.html &&
https://sourceware.org/pipermail/binutils/2025-May/141321.html]
CVE: CVE-2025-1179
cherry picked from upstream commit:
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=67e30b15212adc1502b898a1ca224fdf65dc110d
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=1d68a49ac5d71b648304f69af978fce0f4413800
--- .../binutils/binutils-2.42.inc | 2 + .../binutils/binutils/CVE-2025-1179-pre.patch | 1086 +++++++++++++++++ .../binutils/binutils/CVE-2025-1179.patch | 269 ++++ 3 files changed, 1357 insertions(+) create mode 100644 meta/recipes-devtools/binutils/binutils/CVE-2025-1179-pre.patch create mode 100644 meta/recipes-devtools/binutils/binutils/CVE-2025-1179.patch
meta/recipes-devtools/binutils/binutils-2.42.inc +2 -0
@@ -48,5 +48,7 @@ SRC_URI = "\ file://0019-CVE-2025-1153-1.patch \ file://0020-CVE-2025-1153-2.patch \ file://0021-CVE-2025-1153-3.patch \ + file://CVE-2025-1179-pre.patch \ + file://CVE-2025-1179.patch \ " S = "${WORKDIR}/git"
meta/recipes-devtools/binutils/binutils/CVE-2025-1179-pre.patch new file +1086 -0
1,086 lines not on this page · raw message
meta/recipes-devtools/binutils/binutils/CVE-2025-1179.patch new file +269 -0
269 lines not on this page · raw message
Signature · 1 line
2.43.0
PATCH 6/11 ruby: fix CVE-2025-27221
In reply to Steve SakomanFrom: Divya Chellam <[email protected]>
In the URI gem before 1.0.3 for Ruby, the URI handling methods (URI.join, URI#merge, URI#+) have an inadvertent leakage of authentication credentials because userinfo is retained even after changing the host.
Reference:
https://security-tracker.debian.org/tracker/CVE-2025-27221
Upstream-patches:
https://github.com/ruby/uri/commit/3675494839112b64d5f082a9068237b277ed1495
https://github.com/ruby/uri/commit/2789182478f42ccbb62197f952eb730e4f02bfc5
--- .../ruby/ruby/CVE-2025-27221-0001.patch | 57 +++++++++++++++ .../ruby/ruby/CVE-2025-27221-0002.patch | 73 +++++++++++++++++++ meta/recipes-devtools/ruby/ruby_3.3.5.bb | 2 + 3 files changed, 132 insertions(+) create mode 100644 meta/recipes-devtools/ruby/ruby/CVE-2025-27221-0001.patch create mode 100644 meta/recipes-devtools/ruby/ruby/CVE-2025-27221-0002.patch
meta/recipes-devtools/ruby/ruby/CVE-2025-27221-0001.patch new file +57 -0
@@ -0,0 +1,57 @@ +From 3675494839112b64d5f082a9068237b277ed1495 Mon Sep 17 00:00:00 2001 +From: Hiroshi SHIBATA <[email protected]> +Date: Fri, 21 Feb 2025 16:29:36 +0900 +Subject: [PATCH] Truncate userinfo with URI#join, URI#merge and URI#+ + +CVE: CVE-2025-27221 + +Upstream-Status: Backport [https://github.com/ruby/uri/commit/3675494839112b64d5f082a9068237b277ed1495] + +Signed-off-by: Divya Chellam <[email protected]> +--- + lib/uri/generic.rb | 6 +++++- + test/uri/test_generic.rb | 11 +++++++++++ + 2 files changed, 16 insertions(+), 1 deletion(-) + +diff --git a/lib/uri/generic.rb b/lib/uri/generic.rb +index f3540a2..ecc78c5 100644 +--- a/lib/uri/generic.rb ++++ b/lib/uri/generic.rb +@@ -1141,7 +1141,11 @@ module URI + end + + # RFC2396, Section 5.2, 7) +- base.set_userinfo(rel.userinfo) if rel.userinfo ++ if rel.userinfo ++ base.set_userinfo(rel.userinfo) ++ else ++ base.set_userinfo(nil) ++ end + base.set_host(rel.host) if rel.host + base.set_port(rel.port) if rel.port + base.query = rel.query if rel.query +diff --git a/test/uri/test_generic.rb b/test/uri/test_generic.rb +index e661937..17ba2b6 100644 +--- a/test/uri/test_generic.rb ++++ b/test/uri/test_generic.rb +@@ -164,6 +164,17 @@ class URI::TestGeneric < Test::Unit::TestCase + # must be empty string to identify as path-abempty, not path-absolute + assert_equal('', url.host) + assert_equal('http:////example.com', url.to_s) ++ ++ # sec-2957667 ++ url = URI.parse('http://user:[email protected]').merge('//example.net') ++ assert_equal('http://example.net', url.to_s) ++ assert_nil(url.userinfo) ++ url = URI.join('http://user:[email protected]', '//example.net') ++ assert_equal('http://example.net', url.to_s) ++ assert_nil(url.userinfo) ++ url = URI.parse('http://user:[email protected]') + '//example.net' ++ assert_equal('http://example.net', url.to_s) ++ assert_nil(url.userinfo) + end + + def test_parse_scheme_with_symbols +-- +2.40.0 +
meta/recipes-devtools/ruby/ruby/CVE-2025-27221-0002.patch new file +73 -0
73 lines not on this page · raw message
meta/recipes-devtools/ruby/ruby_3.3.5.bb +2 -0
@@ -28,6 +28,8 @@ SRC_URI = "http://cache.ruby-lang.org/pub/ruby/${SHRT_VER}/ruby-${PV}.tar.gz \ file://0001-vm_dump.c-Define-REG_S1-and-REG_S2-for-musl-riscv.patch \ file://CVE-2025-27219.patch \ file://CVE-2025-27220.patch \ + file://CVE-2025-27221-0001.patch \ + file://CVE-2025-27221-0002.patch \ " UPSTREAM_CHECK_URI = "https://www.ruby-lang.org/en/downloads/"
Signature · 1 line
2.43.0
PATCH 7/11 libsoup: patch CVE-2025-4476
In reply to Steve SakomanFrom: Ashish Sharma <[email protected]>
Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/e64c221f9c7d09b48b610c5626b3b8c400f0907c]
--- .../libsoup/libsoup-3.4.4/CVE-2025-4476.patch | 38 +++++++++++++++++++ meta/recipes-support/libsoup/libsoup_3.4.4.bb | 1 + 2 files changed, 39 insertions(+) create mode 100644 meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2025-4476.patch
meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2025-4476.patch new file +38 -0
@@ -0,0 +1,38 @@ +From e64c221f9c7d09b48b610c5626b3b8c400f0907c Mon Sep 17 00:00:00 2001 +From: Michael Catanzaro <[email protected]> +Date: Thu, 8 May 2025 09:27:01 -0500 +Subject: [PATCH] auth-digest: fix crash in + soup_auth_digest_get_protection_space() + +We need to validate the Domain parameter in the WWW-Authenticate header. + +Unfortunately this crash only occurs when listening on default ports 80 +and 443, so there's no good way to test for this. The test would require +running as root. + +Fixes #440 + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/e64c221f9c7d09b48b610c5626b3b8c400f0907c] +CVE: CVE-2025-4476 +Signed-off-by: Ashish Sharma <[email protected]> + + + libsoup/auth/soup-auth-digest.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libsoup/auth/soup-auth-digest.c b/libsoup/auth/soup-auth-digest.c +index d8bb2910..292f2045 100644 +--- a/libsoup/auth/soup-auth-digest.c ++++ b/libsoup/auth/soup-auth-digest.c +@@ -220,7 +220,7 @@ soup_auth_digest_get_protection_space (SoupAuth *auth, GUri *source_uri) + if (uri && + g_strcmp0 (g_uri_get_scheme (uri), g_uri_get_scheme (source_uri)) == 0 && + g_uri_get_port (uri) == g_uri_get_port (source_uri) && +- !strcmp (g_uri_get_host (uri), g_uri_get_host (source_uri))) ++ !g_strcmp0 (g_uri_get_host (uri), g_uri_get_host (source_uri))) + dir = g_strdup (g_uri_get_path (uri)); + else + dir = NULL; +-- +GitLab +
meta/recipes-support/libsoup/libsoup_3.4.4.bb +1 -0
@@ -30,6 +30,7 @@ SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz \ file://CVE-2025-32906-2.patch \ file://CVE-2025-46420.patch \ file://CVE-2025-32914.patch \ + file://CVE-2025-4476.patch \ " SRC_URI[sha256sum] = "291c67725f36ed90ea43efff25064b69c5a2d1981488477c05c481a3b4b0c5aa"
Signature · 1 line
2.43.0
PATCH 8/11 binutils: set CVE_STATUS for CVE-2025-1180
In reply to Steve SakomanFrom: Harish Sadineni <[email protected]>
CVE-2025-1180 is fixed with patch from CVE-2025-1176.
More details about CVE is here: https://nvd.nist.gov/vuln/detail/CVE-2025-1179
--- meta/recipes-devtools/binutils/binutils-2.42.inc | 1 + 1 file changed, 1 insertion(+)
meta/recipes-devtools/binutils/binutils-2.42.inc +1 -0
@@ -19,6 +19,7 @@ SRCBRANCH ?= "binutils-2_42-branch" UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)" CVE_STATUS[CVE-2023-25584] = "cpe-incorrect: Applies only for version 2.40 and earlier" +CVE_STATUS[CVE-2025-1180] = "patched: fixed by patch for CVE-2025-1176" SRCREV ?= "6558f9f5f0ccc107a083ae7fbf106ebcb5efa817" BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${SRCBRANCH};protocol=https"
Signature · 1 line
2.43.0
PATCH 9/11 ffmpeg: upgrade 6.1.1 -> 6.1.2
In reply to Steve SakomanFrom: Divyanshu Rathore <[email protected]>
ffmpeg_6.1.2 is the newest available stable release for 6.1. It introduces quite a few bug and CVE fixes, which should help all.
CVEs that are fixed in the upgrade:
CVE-2024-32230
CVE-2024-35366
CVE-2024-36613
CVE-2024-36616
CVE-2024-36617
CVE-2024-36619
CVE-2024-7055
During upgrade it was noticed that the CVE scan doesn't pick up the CVEs as unpatched (CVE-2025-0518, CVE-2025-22919, CVE-2025-22921, CVE-2025-25473, CVE-2024-36618, CVE-2024-35369, CVE-2024-35368, CVE-2024-35367, CVE-2024-35365, CVE-2024-28661, CVE-2023-50007, CVE-2023-49528, CVE-2023-49501), due to improper versioning in NVD,
they are affecting 6.1.2 and hence we are leaving the patches in.
check the changelog mention below for information about fixes.
changelog: https://git.ffmpeg.org/gitweb/ffmpeg.git/shortlog/n6.1.2
This upgrade fixes CVE's hence remove those patches. Refresh vulkan_av1_stable_API.patch as per new codebase.
---
.../ffmpeg/ffmpeg/CVE-2024-32230.patch | 36 -----------------
.../ffmpeg/ffmpeg/CVE-2024-35366.patch | 35 ----------------
.../ffmpeg/ffmpeg/CVE-2024-36613.patch | 37 -----------------
.../ffmpeg/ffmpeg/CVE-2024-36616.patch | 35 ----------------
.../ffmpeg/ffmpeg/CVE-2024-36617.patch | 36 -----------------
.../ffmpeg/ffmpeg/CVE-2024-36619.patch | 36 -----------------
.../ffmpeg/ffmpeg/CVE-2024-7055.patch | 38 ------------------
.../ffmpeg/ffmpeg/vulkan_av1_stable_API.patch | 40 +++++++++----------
.../{ffmpeg_6.1.1.bb => ffmpeg_6.1.2.bb} | 9 +----
9 files changed, 21 insertions(+), 281 deletions(-)
delete mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-32230.patch
delete mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-35366.patch
delete mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-36613.patch
delete mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-36616.patch
delete mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-36617.patch
delete mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-36619.patch
delete mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-7055.patch
rename meta/recipes-multimedia/ffmpeg/{ffmpeg_6.1.1.bb => ffmpeg_6.1.2.bb} (96%)meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-32230.patch deleted +0 -36
@@ -1,36 +0,0 @@ -From 96449cfeaeb95fcfd7a2b8d9ccf7719e97471ed1 Mon Sep 17 00:00:00 2001 -From: Michael Niedermayer <[email protected]> -Date: Mon, 8 Apr 2024 18:38:42 +0200 -Subject: [PATCH] avcodec/mpegvideo_enc: Fix 1 line and one column images - -Fixes: Ticket10952 -Fixes: poc21ffmpeg -Signed-off-by: Michael Niedermayer <[email protected]> - -CVE: CVE-2024-32230 - -Upstream-Status: Backport [https://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=96449cfeaeb95fcfd7a2b8d9ccf7719e97471ed1] - -Signed-off-by: Archana Polampalli <[email protected]> ---- - libavcodec/mpegvideo_enc.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c -index e460ca4..fb4aaa2 100644 ---- a/libavcodec/mpegvideo_enc.c -+++ b/libavcodec/mpegvideo_enc.c -@@ -1198,8 +1198,8 @@ static int load_input_picture(MpegEncContext *s, const AVFrame *pic_arg) - int dst_stride = i ? s->uvlinesize : s->linesize; - int h_shift = i ? s->chroma_x_shift : 0; - int v_shift = i ? s->chroma_y_shift : 0; -- int w = s->width >> h_shift; -- int h = s->height >> v_shift; -+ int w = AV_CEIL_RSHIFT(s->width , h_shift); -+ int h = AV_CEIL_RSHIFT(s->height, v_shift); - const uint8_t *src = pic_arg->data[i]; - uint8_t *dst = pic->f->data[i]; - int vpad = 16; --- -2.40.0 -
meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-35366.patch deleted +0 -35
@@ -1,35 +0,0 @@ -From 0bed22d597b78999151e3bde0768b7fe763fc2a6 Mon Sep 17 00:00:00 2001 -From: Michael Niedermayer <[email protected]> -Date: Tue, 26 Mar 2024 00:39:49 +0100 -Subject: [PATCH] avformat/sbgdec: Check for negative duration - -Fixes: signed integer overflow: 9223372036854775807 - -8000000 cannot be represented in type 'long' -Fixes: 62276/clusterfuzz-testcase-minimized-ffmpeg_dem_SBG_fuzzer-5133181743136768 - -Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg -Signed-off-by: Michael Niedermayer <[email protected]> - -CVE: CVE-2024-35366 - -Upstream-Status: Backport [https://github.com/ffmpeg/ffmpeg/commit/0bed22d597b78999151e3bde0768b7fe763fc2a6] - -Signed-off-by: Archana Polampalli <[email protected]> ---- - libavformat/sbgdec.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libavformat/sbgdec.c b/libavformat/sbgdec.c -index b2662ea..281fe62 100644 ---- a/libavformat/sbgdec.c -+++ b/libavformat/sbgdec.c -@@ -386,7 +386,7 @@ static int parse_options(struct sbg_parser *p) - case 'L': - FORWARD_ERROR(parse_optarg(p, opt, &oarg)); - r = str_to_time(oarg.s, &p->scs.opt_duration); -- if (oarg.e != oarg.s + r) { -+ if (oarg.e != oarg.s + r || p->scs.opt_duration < 0) { - snprintf(p->err_msg, sizeof(p->err_msg), - "syntax error for option -L"); - return AVERROR_INVALIDDATA; --- -2.40.0
meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-36613.patch deleted +0 -37
@@ -1,37 +0,0 @@ -From 50d8e4f27398fd5778485a827d7a2817921f8540 Mon Sep 17 00:00:00 2001 -From: Michael Niedermayer <[email protected]> -Date: Sat, 30 Sep 2023 00:51:29 +0200 -Subject: [PATCH] avformat/dxa: Adjust order of operations around block align - -Fixes: 51896/clusterfuzz-testcase-minimized-ffmpeg_dem_DXA_fuzzer-5730576523198464 -Fixes: signed integer overflow: 2147483566 + 82 cannot be represented in type 'int' - -Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg -Signed-off-by: Michael Niedermayer <[email protected]> -(cherry picked from commit 50d8e4f27398fd5778485a827d7a2817921f8540) -Signed-off-by: Michael Niedermayer <[email protected]> - -CVE: CVE-2024-36613 - -Upstream-Status: Backport [https://github.com/ffmpeg/ffmpeg/commit/50d8e4f27398fd5778485a827d7a2817921f8540] - -Signed-off-by: Archana Polampalli <[email protected]> ---- - libavformat/dxa.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libavformat/dxa.c b/libavformat/dxa.c -index 474b852..b4d9d00 100644 ---- a/libavformat/dxa.c -+++ b/libavformat/dxa.c -@@ -122,7 +122,7 @@ static int dxa_read_header(AVFormatContext *s) - if(ast->codecpar->block_align) { - if (c->bpc > INT_MAX - ast->codecpar->block_align + 1) - return AVERROR_INVALIDDATA; -- c->bpc = ((c->bpc + ast->codecpar->block_align - 1) / ast->codecpar->block_align) * ast->codecpar->block_align; -+ c->bpc = ((c->bpc - 1 + ast->codecpar->block_align) / ast->codecpar->block_align) * ast->codecpar->block_align; - } - c->bytes_left = fsize; - c->wavpos = avio_tell(pb); --- -2.40.0
meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-36616.patch deleted +0 -35
@@ -1,35 +0,0 @@ -From 86f73277bf014e2ce36dd2594f1e0fb8b3bd6661 Mon Sep 17 00:00:00 2001 -From: Michael Niedermayer <[email protected]> -Date: Tue, 26 Mar 2024 01:00:13 +0100 -Subject: [PATCH] avformat/westwood_vqa: Fix 2g packets - -Fixes: signed integer overflow: 2147483424 * 2 cannot be represented in type 'int' -Fixes: 62276/clusterfuzz-testcase-minimized-ffmpeg_dem_WSVQA_fuzzer-4576211411795968 - -Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg -Signed-off-by: Michael Niedermayer <[email protected]> - -CVE: CVE-2024-36616 - -Upstream-Status: Backport [https://github.com/ffmpeg/ffmpeg/commit/86f73277bf014e2ce36dd2594f1e0fb8b3bd6661] - -Signed-off-by: Archana Polampalli <[email protected]> ---- - libavformat/westwood_vqa.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libavformat/westwood_vqa.c b/libavformat/westwood_vqa.c -index 03b2d9e..024f5d3 100644 ---- a/libavformat/westwood_vqa.c -+++ b/libavformat/westwood_vqa.c -@@ -262,7 +262,7 @@ static int wsvqa_read_packet(AVFormatContext *s, - break; - case SND2_TAG: - /* 2 samples/byte, 1 or 2 samples per frame depending on stereo */ -- pkt->duration = (chunk_size * 2) / wsvqa->channels; -+ pkt->duration = (chunk_size * 2LL) / wsvqa->channels; - break; - } - break; --- -2.40.0
meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-36617.patch deleted +0 -36
@@ -1,36 +0,0 @@ -From d973fcbcc2f944752ff10e6a76b0b2d9329937a7 Mon Sep 17 00:00:00 2001 -From: Michael Niedermayer <[email protected]> -Date: Sat, 30 Sep 2023 00:38:17 +0200 -Subject: [PATCH] avformat/cafdec: dont seek beyond 64bit - -Fixes: signed integer overflow: 64 + 9223372036854775807 cannot be represented in type 'long long' -Fixes: 51896/clusterfuzz-testcase-minimized-ffmpeg_dem_CAF_fuzzer-6418242730328064 -Fixes: 62276/clusterfuzz-testcase-minimized-ffmpeg_dem_CAF_fuzzer-6418242730328064 - -Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg -Signed-off-by: Michael Niedermayer <[email protected]> - -CVE: CVE-2024-36617 - -Upstream-Status: Backport [https://github.com/ffmpeg/ffmpeg/commit/d973fcbcc2f944752ff10e6a76b0b2d9329937a7] - -Signed-off-by: Archana Polampalli <[email protected]> ---- - libavformat/cafdec.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libavformat/cafdec.c b/libavformat/cafdec.c -index f5ba0f4..e92e327 100644 ---- a/libavformat/cafdec.c -+++ b/libavformat/cafdec.c -@@ -271,7 +271,7 @@ static int read_pakt_chunk(AVFormatContext *s, int64_t size) - } - } - -- if (avio_tell(pb) - ccount > size) { -+ if (avio_tell(pb) - ccount > size || size > INT64_MAX - ccount) { - av_log(s, AV_LOG_ERROR, "error reading packet table\n"); - return AVERROR_INVALIDDATA; - } --- -2.40.0
meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-36619.patch deleted +0 -36
@@ -1,36 +0,0 @@ -From 28c7094b25b689185155a6833caf2747b94774a4 Mon Sep 17 00:00:00 2001 -From: Michael Niedermayer <[email protected]> -Date: Thu, 4 Apr 2024 00:15:27 +0200 -Subject: [PATCH] avcodec/wavarc: fix signed integer overflow in block type - 6/19 - -Fixes: signed integer overflow: -2088796289 + -91276551 cannot be represented in type 'int' -Fixes: 67772/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WAVARC_fuzzer-6533568953122816 - -Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg -Signed-off-by: Michael Niedermayer <[email protected]> - -CVE: CVE-2024-36619 - -Upstream-Status: Backport [https://github.com/ffmpeg/ffmpeg/commit/28c7094b25b689185155a6833caf2747b94774a4] - -Signed-off-by: Archana Polampalli <[email protected]> ---- - libavcodec/wavarc.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libavcodec/wavarc.c b/libavcodec/wavarc.c -index 09ed4d4..51d91a4 100644 ---- a/libavcodec/wavarc.c -+++ b/libavcodec/wavarc.c -@@ -648,7 +648,7 @@ static int decode_5elp(AVCodecContext *avctx, - for (int o = 0; o < order; o++) - sum += s->filter[ch][o] * (unsigned)samples[n + 70 - o - 1]; - -- samples[n + 70] += ac_out[n] + (sum >> 4); -+ samples[n + 70] += ac_out[n] + (unsigned)(sum >> 4); - } - - for (int n = 0; n < 70; n++) --- -2.40.0
meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-7055.patch deleted +0 -38
@@ -1,38 +0,0 @@ -From 587acd0d4020859e67d1f07aeff2c885797ebcce Mon Sep 17 00:00:00 2001 -From: Michael Niedermayer <[email protected]> -Date: Thu, 18 Jul 2024 21:12:54 +0200 -Subject: [PATCH] avcodec/pnmdec: Use 64bit for input size check - -Fixes: out of array read -Fixes: poc3 - -Reported-by: VulDB CNA Team -Found-by: CookedMelon -Signed-off-by: Michael Niedermayer <[email protected]> -(cherry picked from commit 3faadbe2a27e74ff5bb5f7904ec27bb1f5287dc8) -Signed-off-by: Michael Niedermayer <[email protected]> - -CVE: CVE-2024-7055 - -Upstream-Status: Backport [https://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=587acd0d4020859e67d1f07aeff2c885797ebcce] - -Signed-off-by: Archana Polampalli <[email protected]> ---- - libavcodec/pnmdec.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libavcodec/pnmdec.c b/libavcodec/pnmdec.c -index acd77ea..40cc2ae 100644 ---- a/libavcodec/pnmdec.c -+++ b/libavcodec/pnmdec.c -@@ -264,7 +264,7 @@ static int pnm_decode_frame(AVCodecContext *avctx, AVFrame *p, - break; - case AV_PIX_FMT_GBRPF32: - if (!s->half) { -- if (avctx->width * avctx->height * 12 > s->bytestream_end - s->bytestream) -+ if (avctx->width * avctx->height * 12LL > s->bytestream_end - s->bytestream) - return AVERROR_INVALIDDATA; - scale = 1.f / s->scale; - if (s->endian) { --- -2.40.0
meta/recipes-multimedia/ffmpeg/ffmpeg/vulkan_av1_stable_API.patch +20 -20
@@ -6,6 +6,9 @@ Subject: [PATCH] vulkan_av1: port to the new stable API Co-Authored-by: Dave Airlie <[email protected]> Signed-off-by: Dmitry Baryshkov <[email protected]> Upstream-Status: Backport [https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/ecdc94b97f809d5f2b88640842fd0541951ad295] + +Comment: Patch is refreshed as per codebase of 6.1.2 +Signed-off-by: Divyanshu Rathore <[email protected]> --- configure | 4 +- libavcodec/Makefile | 5 +-
@@ -26,7 +29,7 @@ diff --git a/configure b/configure index e853deb51d..9fa639fca6 100755 --- a/configure +++ b/configure -@@ -7300,8 +7300,8 @@ enabled vdpau && +@@ -7160,8 +7160,8 @@ enabled crystalhd && check_lib crystalhd "in maintaining it." if enabled vulkan; then
@@ -41,21 +44,19 @@ diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 7ef2e03ca6..9ce6d445c1 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile -@@ -1258,8 +1258,7 @@ SKIPHEADERS += %_tablegen.h \ +@@ -1284,7 +1284,6 @@ SKIPHEADERS + aacenc_quantization.h \ aacenc_quantization_misc.h \ bitstream_template.h \ -- vulkan_video_codec_av1std.h \ -- $(ARCH)/vpx_arith.h \ -+ $(ARCH)/vpx_arith.h \ +- vulkan_video_codec_av1std_mesa.h \ + $(ARCH)/vpx_arith.h \ SKIPHEADERS-$(CONFIG_AMF) += amfenc.h - SKIPHEADERS-$(CONFIG_D3D11VA) += d3d11va.h dxva2_internal.h -@@ -1280,7 +1279,7 @@ SKIPHEADERS-$(CONFIG_QSVENC) += qsvenc.h +@@ -1306,7 +1305,7 @@ SKIPHEADERS-$(CONFIG_XVMC) + SKIPHEADERS-$(CONFIG_VAAPI) += vaapi_decode.h vaapi_hevc.h vaapi_encode.h SKIPHEADERS-$(CONFIG_VDPAU) += vdpau.h vdpau_internal.h SKIPHEADERS-$(CONFIG_VIDEOTOOLBOX) += videotoolbox.h vt_internal.h --SKIPHEADERS-$(CONFIG_VULKAN) += vulkan.h vulkan_video.h vulkan_decode.h vulkan_video_codec_av1std_decode.h +-SKIPHEADERS-$(CONFIG_VULKAN) += vulkan.h vulkan_video.h vulkan_decode.h vulkan_video_codec_av1std_decode_mesa.h +SKIPHEADERS-$(CONFIG_VULKAN) += vulkan.h vulkan_video.h vulkan_decode.h SKIPHEADERS-$(CONFIG_V4L2_M2M) += v4l2_buffers.h v4l2_context.h v4l2_m2m.h SKIPHEADERS-$(CONFIG_ZLIB) += zlib_wrapper.h
@@ -866,19 +867,19 @@ diff --git a/libavcodec/vulkan_video.h b/libavcodec/vulkan_video.h index bb69e920bb..01a1de7d9d 100644 --- a/libavcodec/vulkan_video.h +++ b/libavcodec/vulkan_video.h -@@ -22,8 +22,6 @@ +@@ -23,8 +23,6 @@ #include "vulkan.h" #include <vk_video/vulkan_video_codecs_common.h> --#include "vulkan_video_codec_av1std.h" --#include "vulkan_video_codec_av1std_decode.h" +-#include "vulkan_video_codec_av1std_mesa.h" +-#include "vulkan_video_codec_av1std_decode_mesa.h" #define CODEC_VER_MAJ(ver) (ver >> 22) #define CODEC_VER_MIN(ver) ((ver >> 12) & ((1 << 10) - 1)) -diff --git a/libavcodec/vulkan_video_codec_av1std_decode.h b/libavcodec/vulkan_video_codec_av1std_decode.h +diff --git a/libavcodec/vulkan_video_codec_av1std_decode_mesa.h b/libavcodec/vulkan_video_codec_av1std_decode_mesa.h deleted file mode 100644 index e2f37b4e6e..0000000000 ---- a/libavcodec/vulkan_video_codec_av1std_decode.h +--- a/libavcodec/vulkan_video_codec_av1std_decode_mesa.h +++ /dev/null @@ -1,36 +0,0 @@ -/* Copyright 2023 Lynne
@@ -897,8 +898,8 @@ index e2f37b4e6e..0000000000 - * limitations under the License. - */ - --#ifndef VULKAN_VIDEO_CODEC_AV1STD_DECODE_H_ --#define VULKAN_VIDEO_CODEC_AV1STD_DECODE_H_ 1 +-#ifndef VULKAN_VIDEO_CODEC_AV1STD_DECODE_MESA_H_ +-#define VULKAN_VIDEO_CODEC_AV1STD_DECODE_MESA_H_ 1 - -/* -** This header is NOT YET generated from the Khronos Vulkan XML API Registry.
@@ -917,10 +918,10 @@ index e2f37b4e6e..0000000000 -#endif - -#endif -diff --git a/libavcodec/vulkan_video_codec_av1std.h b/libavcodec/vulkan_video_codec_av1std.h +diff --git a/libavcodec/vulkan_video_codec_av1std_mesa.h b/libavcodec/vulkan_video_codec_av1std_mesa.h deleted file mode 100644 index c91589eee2..0000000000 ---- a/libavcodec/vulkan_video_codec_av1std.h +--- a/libavcodec/vulkan_video_codec_av1std_mesa.h +++ /dev/null @@ -1,403 +0,0 @@ -/* Copyright 2023 Lynne
@@ -939,8 +940,8 @@ index c91589eee2..0000000000 - * limitations under the License. - */ - --#ifndef VULKAN_VIDEO_CODEC_AV1STD_H_ --#define VULKAN_VIDEO_CODEC_AV1STD_H_ 1 +-#ifndef VULKAN_VIDEO_CODEC_AV1STD_MESA_H_ +-#define VULKAN_VIDEO_CODEC_AV1STD_MESA_H_ 1 - -/* -** This header is NOT YET generated from the Khronos Vulkan XML API Registry.
@@ -1379,4 +1380,3 @@ diff --git a/libavcodec/vulkan_video.c b/libavcodec/vulkan_video.c -- 2.25.1 -
meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.2.bb renamed from meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb +1 -8
@@ -31,21 +31,14 @@ SRC_URI = " \ file://CVE-2024-31578.patch \ file://CVE-2024-31582.patch \ file://CVE-2023-50008.patch \ - file://CVE-2024-32230.patch \ file://CVE-2023-49501.patch \ file://CVE-2024-28661.patch \ file://CVE-2023-50007.patch \ file://CVE-2023-49528.patch \ - file://CVE-2024-7055.patch \ - file://CVE-2024-35366.patch \ file://CVE-2024-35367.patch \ file://CVE-2024-35368.patch \ file://CVE-2024-35365.patch \ - file://CVE-2024-36613.patch \ - file://CVE-2024-36616.patch \ - file://CVE-2024-36617.patch \ file://CVE-2024-36618.patch \ - file://CVE-2024-36619.patch \ file://CVE-2024-35369.patch \ file://CVE-2025-25473.patch \ file://CVE-2025-22919.patch \
@@ -53,7 +46,7 @@ SRC_URI = " \ file://CVE-2025-0518.patch \ " -SRC_URI[sha256sum] = "8684f4b00f94b85461884c3719382f1261f0d9eb3d59640a1f4ac0873616f968" +SRC_URI[sha256sum] = "3b624649725ecdc565c903ca6643d41f33bd49239922e45c9b1442c63dca4e38" # https://nvd.nist.gov/vuln/detail/CVE-2023-39018 # https://github.com/bramp/ffmpeg-cli-wrapper/issues/291
Signature · 1 line
2.43.0
PATCH 10/11 util-linux: Add fix to isolate test fstab entries using CUSTOM_FSTAB
In reply to Steve SakomanFrom: Virendra Thakur <[email protected]>
During ptest execution, util-linux adds mount entries in /etc/fstab and runs mount -a, which mounts all available entries from /etc/fstab. This can cause unintended mounts that are unrelated to the test, leading to incorrect test behavior.
To avoid this, upstream util-linux introduced a mechanism using CUSTOM_FSTAB,which isolates test-specific fstab entries. Only entries listed in CUSTOM_FSTAB are mounted during test execution, ensuring tests do not interfere with or depend on the system's /etc/fstab.
This commit backports below upstream changes to use CUSTOM_FSTAB.
https://github.com/util-linux/util-linux/commit/ed3d33faff17fb702a3acfca2f9f24e69f4920de
https://github.com/util-linux/util-linux/commit/b1580bd760519a2cf052f023057846e54de47484
https://github.com/util-linux/util-linux/commit/6aa8d17b6b53b86a46c5da68c02a893113130496
--- meta/recipes-core/util-linux/util-linux.inc | 1 + .../util-linux/fstab-isolation.patch | 448 ++++++++++++++++++ 2 files changed, 449 insertions(+) create mode 100644 meta/recipes-core/util-linux/util-linux/fstab-isolation.patch
meta/recipes-core/util-linux/util-linux.inc +1 -0
@@ -42,6 +42,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-lin file://fcntl-lock.c \ file://CVE-2024-28085-0001.patch \ file://CVE-2024-28085-0002.patch \ + file://fstab-isolation.patch \ " SRC_URI[sha256sum] = "7b6605e48d1a49f43cc4b4cfc59f313d0dd5402fa40b96810bd572e167dfed0f"
meta/recipes-core/util-linux/util-linux/fstab-isolation.patch new file +448 -0
448 lines not on this page · raw message
Signature · 1 line
2.43.0
PATCH 11/11 u-boot: ensure keys are generated before assembling U-Boot FIT image
In reply to Steve SakomanFrom: Rogerio Guerra Borin <[email protected]>
Add the task dependency:
do_uboot_assemble_fitimage -> virtual/kernel:do_kernel_generate_rsa_keys
to ensure the kernel FIT image signing keys are available when creating the U-Boot DTB. This is done only if the signing of the kernel FIT image is enabled (UBOOT_SIGN_ENABLE="1").
The lack of the dependency causes build errors when executing a build with no kernel FIT keys initially present in the keys directory. In such cases one would see an output like this in the Bitbake logs:
Log data follows:
| DEBUG: Executing shell function do_uboot_assemble_fitimage | Couldn't open RSA private key: '/workdir/build/keys/fit/dev.key': No such file or directory | Failed to sign 'signature' signature node in 'conf-1' conf node | FIT description: Kernel Image image with one or more FDT blobs | ...
This issue was introduced by commit 259bfa86f384 where the dependency between U-Boot and the kernel was removed (for good reasons). Before that commit the dependency was set via DEPENDS so that, in terms of tasks, one had:
u-boot:do_configure -> virtual/kernel:do_populate_sysroot
and the chain leading to the key generation was:
virtual/kernel:do_populate_sysroot -> virtual/kernel:do_install virtual/kernel:do_install -> virtual/kernel:do_assemble_fitimage virtual/kernel:do_assemble_fitimage -> virtual/kernel:do_kernel_generate_rsa_keys
With the removal of the first dependency, no more guarantees exist that the keys would be present when assembling the U-Boot FIT image. That's the situation we are solving with the present commit.
(From OE-Core rev: 036f20156b3c7d0a8b912e90aa29a9b986106d5a)
--- meta/classes-recipe/uboot-sign.bbclass | 2 ++ 1 file changed, 2 insertions(+)
meta/classes-recipe/uboot-sign.bbclass +2 -0
@@ -94,6 +94,8 @@ python() { sign = d.getVar('UBOOT_SIGN_ENABLE') == '1' if d.getVar('UBOOT_FITIMAGE_ENABLE') == '1' or sign: d.appendVar('DEPENDS', " u-boot-tools-native dtc-native") + if d.getVar('FIT_GENERATE_KEYS') == '1' and sign: + d.appendVarFlag('do_uboot_assemble_fitimage', 'depends', ' virtual/kernel:do_kernel_generate_rsa_keys') } concat_dtb() {
Signature · 1 line
2.43.0