@@ -35,5 +35,6 @@ SRC_URI = "\
file://0012-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch \
file://0013-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch \
file://0014-Remove-duplicate-pe-dll.o-entry-deom-targ_extra_ofil.patch \
+ file://CVE-2025-1180.patch \
"
S = "${WORKDIR}/git"
new file mode 100644
@@ -0,0 +1,165 @@
+From 509c5afcd71afd36cd6496f8c84733b11bd5e9e5 Mon Sep 17 00:00:00 2001
+From: Nick Clifton <nickc@redhat.com>
+Date: Thu, 22 May 2025 01:56:17 -0700
+Subject: [PATCH] Backport fix for PR 32642(CVE-2025-1180)
+
+Backporting the fix from PR 32636 to fix PR 32642 (ld SEGV (illegal read access)
+in _bfd_elf_write_section_eh_frame (bfd/elf-eh-frame.c:2234:29) with
+ --gc-sections --gc-keep-exported option)
+
+https://nvd.nist.gov/vuln/detail/CVE-2025-1180 is associated with
+PR32642 which will get fixed with commit from PR 32636.
+
+(cherry picked from commit: f9978defb6fab0bd8583942d97c112b0932ac814)
+Upstream-Status: Submitted [https://sourceware.org/pipermail/binutils/2025-May/141351.html]
+CVE: CVE-2025-1180
+
+Signed-off-by: Harish Sadineni <Harish.Sadineni@windriver.com>
+---
+ bfd/elflink.c | 88 +++++++++++++++++++++++++--------------------------
+ 1 file changed, 44 insertions(+), 44 deletions(-)
+
+diff --git a/bfd/elflink.c b/bfd/elflink.c
+index 6346d7e2b4b..d765b688801 100644
+--- a/bfd/elflink.c
++++ b/bfd/elflink.c
+@@ -96,22 +96,37 @@ _bfd_elf_link_keep_memory (struct bfd_link_info *info)
+ return true;
+ }
+
+-asection *
+-_bfd_elf_section_for_symbol (struct elf_reloc_cookie *cookie,
+- unsigned long r_symndx,
+- bool discard)
++static struct elf_link_hash_entry *
++get_ext_sym_hash (struct elf_reloc_cookie *cookie, unsigned long r_symndx)
+ {
+- if (r_symndx >= cookie->locsymcount
+- || ELF_ST_BIND (cookie->locsyms[r_symndx].st_info) != STB_LOCAL)
+- {
+- struct elf_link_hash_entry *h;
++ struct elf_link_hash_entry *h = NULL;
+
++ if ((r_symndx >= cookie->locsymcount
++ || ELF_ST_BIND (cookie->locsyms[r_symndx].st_info) != STB_LOCAL)
++ /* Guard against corrupt input. See PR 32636 for an example. */
++ && r_symndx >= cookie->extsymoff)
++ {
+ h = cookie->sym_hashes[r_symndx - cookie->extsymoff];
+
+ while (h->root.type == bfd_link_hash_indirect
+ || h->root.type == bfd_link_hash_warning)
+ h = (struct elf_link_hash_entry *) h->root.u.i.link;
++ }
++
++ return h;
++}
+
++asection *
++_bfd_elf_section_for_symbol (struct elf_reloc_cookie *cookie,
++ unsigned long r_symndx,
++ bool discard)
++{
++ struct elf_link_hash_entry *h;
++
++ h = get_ext_sym_hash (cookie, r_symndx);
++
++ if (h != NULL)
++ {
+ if ((h->root.type == bfd_link_hash_defined
+ || h->root.type == bfd_link_hash_defweak)
+ && discarded_section (h->root.u.def.section))
+@@ -119,21 +134,20 @@ _bfd_elf_section_for_symbol (struct elf_reloc_cookie *cookie,
+ else
+ return NULL;
+ }
+- else
+- {
+- /* It's not a relocation against a global symbol,
+- but it could be a relocation against a local
+- symbol for a discarded section. */
+- asection *isec;
+- Elf_Internal_Sym *isym;
+
+- /* Need to: get the symbol; get the section. */
+- isym = &cookie->locsyms[r_symndx];
+- isec = bfd_section_from_elf_index (cookie->abfd, isym->st_shndx);
+- if (isec != NULL
+- && discard ? discarded_section (isec) : 1)
+- return isec;
+- }
++ /* It's not a relocation against a global symbol,
++ but it could be a relocation against a local
++ symbol for a discarded section. */
++ asection *isec;
++ Elf_Internal_Sym *isym;
++
++ /* Need to: get the symbol; get the section. */
++ isym = &cookie->locsyms[r_symndx];
++ isec = bfd_section_from_elf_index (cookie->abfd, isym->st_shndx);
++ if (isec != NULL
++ && discard ? discarded_section (isec) : 1)
++ return isec;
++
+ return NULL;
+ }
+
+@@ -13994,22 +14008,12 @@ _bfd_elf_gc_mark_rsec (struct bfd_link_info *info, asection *sec,
+ if (r_symndx == STN_UNDEF)
+ return NULL;
+
+- if (r_symndx >= cookie->locsymcount
+- || ELF_ST_BIND (cookie->locsyms[r_symndx].st_info) != STB_LOCAL)
++ h = get_ext_sym_hash (cookie, r_symndx);
++
++ if (h != NULL)
+ {
+ bool was_marked;
+
+- h = cookie->sym_hashes[r_symndx - cookie->extsymoff];
+- if (h == NULL)
+- {
+- info->callbacks->fatal (_("%F%P: corrupt input: %pB\n"),
+- sec->owner);
+- return NULL;
+- }
+- while (h->root.type == bfd_link_hash_indirect
+- || h->root.type == bfd_link_hash_warning)
+- h = (struct elf_link_hash_entry *) h->root.u.i.link;
+-
+ was_marked = h->mark;
+ h->mark = 1;
+ /* Keep all aliases of the symbol too. If an object symbol
+@@ -15064,17 +15068,12 @@ bfd_elf_reloc_symbol_deleted_p (bfd_vma offset, void *cookie)
+ if (r_symndx == STN_UNDEF)
+ return true;
+
+- if (r_symndx >= rcookie->locsymcount
+- || ELF_ST_BIND (rcookie->locsyms[r_symndx].st_info) != STB_LOCAL)
+- {
+- struct elf_link_hash_entry *h;
+-
+- h = rcookie->sym_hashes[r_symndx - rcookie->extsymoff];
++ struct elf_link_hash_entry *h;
+
+- while (h->root.type == bfd_link_hash_indirect
+- || h->root.type == bfd_link_hash_warning)
+- h = (struct elf_link_hash_entry *) h->root.u.i.link;
++ h = get_ext_sym_hash (rcookie, r_symndx);
+
++ if (h != NULL)
++ {
+ if ((h->root.type == bfd_link_hash_defined
+ || h->root.type == bfd_link_hash_defweak)
+ && (h->root.u.def.section->owner != rcookie->abfd
+@@ -15098,6 +15097,7 @@ bfd_elf_reloc_symbol_deleted_p (bfd_vma offset, void *cookie)
+ || discarded_section (isec)))
+ return true;
+ }
++
+ return false;
+ }
+ return false;
+--
+2.49.0
+