import binutils-2.30-101.el8

SOURCES/binutils-CVE-2021-3487.patch

@@ -0,0 +1,38 @@
+--- binutils.orig/bfd/dwarf2.c	2021-04-14 14:24:18.945917267 +0100
++++ binutils-2.30/bfd/dwarf2.c	2021-04-14 14:25:51.908614106 +0100
+@@ -532,6 +532,10 @@ read_section (bfd *	      abfd,
+   /* The section may have already been read.  */
+   if (contents == NULL)
+     {
++      bfd_size_type amt;
++      asection *msec;
++      ufile_ptr filesize;
++
+       msec = bfd_get_section_by_name (abfd, section_name);
+       if (! msec)
+ 	{
+@@ -547,10 +551,22 @@ read_section (bfd *	      abfd,
+ 	  return FALSE;
+ 	}
+ 
+-      *section_size = msec->rawsize ? msec->rawsize : msec->size;
++      amt = bfd_get_section_limit_octets (abfd, msec);
++      filesize = bfd_get_file_size (abfd);
++      if (amt >= filesize)
++       {
++         /* PR 26946 */
++         _bfd_error_handler (_("DWARF error: section %s is larger than its filesize! (0x%lx vs 0x%lx)"),
++                             section_name, (long) amt, (long) filesize);
++         bfd_set_error (bfd_error_bad_value);
++         return FALSE;
++       }
++      *section_size = amt;
++
+       /* Paranoia - alloc one extra so that we can make sure a string
+ 	 section is NUL terminated.  */
+-      amt = *section_size + 1;
++      amt += 1;
++
+       if (amt == 0)
+ 	{
+ 	  bfd_set_error (bfd_error_no_memory);

SPECS/binutils.spec

@@ -43,7 +43,7 @@
 Summary: A GNU collection of binary utilities
 Name: binutils%{?name_cross}%{?_with_debug:-debug}
 Version: 2.30
-Release: 99%{?dist}
+Release: 101%{?dist}
 License: GPLv3+
 URL: https://sourceware.org/binutils
 
@@ -570,9 +570,10 @@ Patch86: binutils-CVE-2021-20197.patch
 # Lifetime: Fixed in 2.35
 Patch87: binutils-mark-all-weak-aliases.patch
 
-# Purpose:  Enable support for ARMv8.6 ISA.
+# Purpose:  Fix excessive memory consumption when attempting to parse corrupt
+#            DWARF debug information.
 # Lifetime: Fixed in 2.36
-Patch88: binutils-aarch64-armv8.6-support.patch
+Patch88: binutils-CVE-2021-3487.patch
 
 #----------------------------------------------------------------------------
 
@@ -699,6 +700,14 @@ dynamic libraries.
 Developers starting new projects are strongly encouraged to consider
 using libelf instead of BFD.
 
+# BZ 1924068.  Since applications that use the BFD library are
+# required to link against the static version, ensure that it retains
+# its debug informnation.
+# FIXME: Yes - this is being done twice.  I have no idea why this
+# second invocation is necessary but if both are not present the
+# static archives will be stripped.
+%undefine __brp_strip_static_archive
+
 #----------------------------------------------------------------------------
 
 %prep
@@ -1240,6 +1249,13 @@ exit 0
 
 #----------------------------------------------------------------------------
 %changelog
+* Wed Apr 14 2021 Nick Clifton  <nickc@redhat.com> - 2.30-101
+- Fix excessive memory consumption in the BFD librart when parsing corrupt DWARF information.  (#1947134)
+
+* Fri Apr 09 2021 Nick Clifton  <nickc@redhat.com> - 2.30-100
+- Do not strip the static BFD library.  (For real this time).  (#1924068)
+- Remove support for ARM v8.6 ISA.  (#1875912)
+
 * Thu Mar 25 2021 Nick Clifton  <nickc@redhat.com> - 2.30-99
 - Fix bug in previous patch to enable support for ARM v8.6 ISA.  (#1875912)