diff mbox series

[scarthgap,08/19] binutils: Fix for CVE-2025-69648 and CVE-2025-69646

Message ID cbf2b04bd793a114d8ea5f59476274a9edfbcff3.1782742373.git.yoann.congal@smile.fr
State New
Headers show
Series [scarthgap,01/19] gawk: use native gawk when building glibc and grub | expand

Commit Message

Yoann Congal June 29, 2026, 2:19 p.m. UTC 
From: Harish Sadineni <Harish.Sadineni@windriver.com>

CVE-2025-69648 was marked as a duplicate of CVE-2025-69646. The
existing patch already fixes the issue associated with both CVEs.

Rename the patch and update the CVE tag to reference both identifiers.

Signed-off-by: Harish Sadineni <Harish.Sadineni@windriver.com>
Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
---
 meta/recipes-devtools/binutils/binutils-2.42.inc                | 2 +-
 ...CVE-2025-69648.patch => CVE-2025-69646_CVE-2025-69648.patch} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/binutils/binutils/{CVE-2025-69648.patch => CVE-2025-69646_CVE-2025-69648.patch} (99%)
diff mbox series

Patch

diff --git a/meta/recipes-devtools/binutils/binutils-2.42.inc b/meta/recipes-devtools/binutils/binutils-2.42.inc
index 7e83f72632f..342229af26a 100644
--- a/meta/recipes-devtools/binutils/binutils-2.42.inc
+++ b/meta/recipes-devtools/binutils/binutils-2.42.inc
@@ -73,6 +73,6 @@  SRC_URI = "\
      file://0029-CVE-2025-11839.patch \
      file://0030-CVE-2025-11840.patch \
      file://CVE-2025-69644-CVE-2025-69647.patch \
-     file://CVE-2025-69648.patch \
+     file://CVE-2025-69646_CVE-2025-69648.patch \
 "
 S  = "${WORKDIR}/git"
diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2025-69648.patch b/meta/recipes-devtools/binutils/binutils/CVE-2025-69646_CVE-2025-69648.patch
similarity index 99%
rename from meta/recipes-devtools/binutils/binutils/CVE-2025-69648.patch
rename to meta/recipes-devtools/binutils/binutils/CVE-2025-69646_CVE-2025-69648.patch
index e04d7ed6c21..b02b5e05317 100644
--- a/meta/recipes-devtools/binutils/binutils/CVE-2025-69648.patch
+++ b/meta/recipes-devtools/binutils/binutils/CVE-2025-69646_CVE-2025-69648.patch
@@ -19,7 +19,7 @@  length field.
 	(display_debug_ranges): Check display_debug_rnglists_unit_header
 	return status.  Stop output on error.
 
-CVE: CVE-2025-69648
+CVE: CVE-2025-69646 CVE-2025-69648
 Upstream-Status: Backport [https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=598704a00cbac5e85c2bedd363357b5bf6fcee33]
 
 (cherry picked from commit 598704a00cbac5e85c2bedd363357b5bf6fcee33)