From e2a60581caf760b9b0d195ff8c2e6111138c6cf1 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 8 Feb 2026 19:16:03 +0000 Subject: [PATCH] binutils-unwrapped: 2.44 -> 2.46 Changes: https://sourceware.org/pipermail/binutils/2026-February/148149.html --- .../tools/misc/binutils/CVE-2025-5244.diff | 13 ---------- .../tools/misc/binutils/CVE-2025-5245.diff | 26 ------------------- .../tools/misc/binutils/default.nix | 12 ++------- 3 files changed, 2 insertions(+), 49 deletions(-) delete mode 100644 pkgs/development/tools/misc/binutils/CVE-2025-5244.diff delete mode 100644 pkgs/development/tools/misc/binutils/CVE-2025-5245.diff diff --git a/pkgs/development/tools/misc/binutils/CVE-2025-5244.diff b/pkgs/development/tools/misc/binutils/CVE-2025-5244.diff deleted file mode 100644 index 947172f2866a..000000000000 --- a/pkgs/development/tools/misc/binutils/CVE-2025-5244.diff +++ /dev/null @@ -1,13 +0,0 @@ -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 deleted file mode 100644 index 27592a8d0e87..000000000000 --- a/pkgs/development/tools/misc/binutils/CVE-2025-5245.diff +++ /dev/null @@ -1,26 +0,0 @@ -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 d632b1ade6ea..05f863742d31 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -34,7 +34,7 @@ assert enableGoldDefault -> enableGold; let inherit (stdenv) buildPlatform hostPlatform targetPlatform; - version = "2.44"; + version = "2.46"; #INFO: The targetPrefix prepended to binary names to allow multiple binuntils # on the PATH to both be usable. @@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnu/binutils/binutils-with-gold-${version}.tar.bz2"; - hash = "sha256-NHM+pJXMDlDnDbTliQ3sKKxB8OFMShZeac8n+5moxMg="; + hash = "sha256-uMmj15bcCw6OqTXcJMXI1vNF6xd62lrGpbESLHfWIVg="; }; # WARN: this package is used for bootstrapping fetchurl, and thus cannot use @@ -120,14 +120,6 @@ 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 = [