binutils: add CVE-2025-1182 patch file to SRC_URI

Forgot to add CVE-2025-1182 patch file to SRC_URI in the following commit
https://lists.openembedded.org/g/openembedded-core/message/217350

After rebasing the CVE-2025-1180.patch, we encountered hunk errors while applying the
CVE-2025-1182.patch, so I have modified the patch accordingly.

Signed-off-by: Harish Sadineni <Harish.Sadineni@windriver.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>

diff --git a/meta/recipes-devtools/binutils/binutils-2.38.inc b/meta/recipes-devtools/binutils/binutils-2.38.inc
index 01fd03d2f46e83375f9095a888f0a9cdeaea97ec..085ca2301edc1d1f8663818127385551bdc96272 100644 (file)
--- a/meta/recipes-devtools/binutils/binutils-2.38.inc
+++ b/meta/recipes-devtools/binutils/binutils-2.38.inc
@@ -75,5 +75,6 @@ SRC_URI = "\
      file://0038-CVE-2025-0840.patch \
      file://0039-CVE-2025-1178.patch \
      file://0040-CVE-2025-1180.patch \
+     file://0040-CVE-2025-1182.patch \
 "
 S  = "${WORKDIR}/git"

diff --git a/meta/recipes-devtools/binutils/binutils/0040-CVE-2025-1182.patch b/meta/recipes-devtools/binutils/binutils/0040-CVE-2025-1182.patch
index 682f633927eae5bb5defe83435c7c1ad96b202b6..03604bfdd40fb687d63ece7cd8bd3be530870326 100644 (file)
--- a/meta/recipes-devtools/binutils/binutils/0040-CVE-2025-1182.patch
+++ b/meta/recipes-devtools/binutils/binutils/0040-CVE-2025-1182.patch
@@ -18,14 +18,14 @@ Signed-off-by: Harish Sadineni <Harish.Sadineni@windriver.com>
 diff --git a/bfd/elflink.c b/bfd/elflink.c
 --- a/bfd/elflink.c
 +++ b/bfd/elflink.c
-@@ -14711,6 +14711,10 @@
-        }
+@@ -14712,6 +14712,10 @@
+       }
        else
-        {
-+         if (r_symndx >= rcookie->locsymcount)
-+           /* This can happen with corrupt input.  */
-+           return false;
+       {
++        if (r_symndx >= rcookie->locsymcount)
++          /* This can happen with corrupt input.  */
++          return false;
 +
-          /* It's not a relocation against a global symbol,
-             but it could be a relocation against a local
-             symbol for a discarded section.  */
+         /* It's not a relocation against a global symbol,
+            but it could be a relocation against a local
+            symbol for a discarded section.  */