diff --git a/pkgs/development/tools/misc/binutils/CVE-2025-5244.diff b/pkgs/development/tools/misc/binutils/CVE-2025-5244.diff new file mode 100644 index 000000000000..947172f2866a --- /dev/null +++ b/pkgs/development/tools/misc/binutils/CVE-2025-5244.diff @@ -0,0 +1,13 @@ +Backported patch originally targeted against 2.45. +--- a/bfd/elflink.c ++++ b/bfd/elflink.c +@@ -14356,5 +14356,6 @@ elf_gc_sweep (bfd *abfd, struct bfd_link_info *info) + if (o->flags & SEC_GROUP) + { + asection *first = elf_next_in_group (o); +- o->gc_mark = first->gc_mark; ++ if (first != NULL) ++ o->gc_mark = first->gc_mark; + } + + if (o->gc_mark) diff --git a/pkgs/development/tools/misc/binutils/CVE-2025-5245.diff b/pkgs/development/tools/misc/binutils/CVE-2025-5245.diff new file mode 100644 index 000000000000..27592a8d0e87 --- /dev/null +++ b/pkgs/development/tools/misc/binutils/CVE-2025-5245.diff @@ -0,0 +1,26 @@ +Backported patch originally targeted against 2.45. +--- a/binutils/debug.c ++++ b/binutils/debug.c +@@ -2554,9 +2554,6 @@ debug_write_type (struct debug_handle *info, + case DEBUG_KIND_UNION_CLASS: + return debug_write_class_type (info, fns, fhandle, type, tag); + case DEBUG_KIND_ENUM: +- if (type->u.kenum == NULL) +- return (*fns->enum_type) (fhandle, tag, (const char **) NULL, +- (bfd_signed_vma *) NULL); + return (*fns->enum_type) (fhandle, tag, type->u.kenum->names, + type->u.kenum->values); + case DEBUG_KIND_POINTER: +@@ -3097,9 +3094,9 @@ debug_type_samep (struct debug_handle *info, struct debug_type_s *t1, + break; + + case DEBUG_KIND_ENUM: +- if (t1->u.kenum == NULL) +- ret = t2->u.kenum == NULL; +- else if (t2->u.kenum == NULL) ++ if (t1->u.kenum->names == NULL) ++ ret = t2->u.kenum->names == NULL; ++ else if (t2->u.kenum->names == NULL) + ret = false; + else + { diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 04e311bf38a1..2dee9eb4f572 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -118,6 +118,14 @@ stdenv.mkDerivation (finalAttrs: { ./avr-size.patch ./windres-locate-gcc.patch + + # Backported against CVE patched in the 2.45 series. See: + # https://nvd.nist.gov/vuln/detail/CVE-2025-5244 + ./CVE-2025-5244.diff + + # Backported against CVE patched in the 2.45 series. See: + # https://nvd.nist.gov/vuln/detail/CVE-2025-5245 + ./CVE-2025-5245.diff ]; outputs = [