rpms
/
binutils
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix merging ppc64le notes. (#1928936)

This commit is contained in:
Nick Clifton 2021-02-18 13:40:05 +00:00
parent 97c55e4637
commit 39727409f1
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
binutils-ppc64le-note-merge.patch Normal file
View File

@ -0,0 +1,14 @@
--- binutils.orig/binutils/objcopy.c 2021-02-18 11:35:48.062479490 +0000
+++ binutils-2.30/binutils/objcopy.c 2021-02-18 11:36:52.207071148 +0000
@@ -2224,6 +2224,11 @@ merge_gnu_build_notes (bfd * ab
goto done;
}
+ if (start > end)
+ /* This can happen with PPC64LE binaries where empty notes are
+ encoded as start = end + 4. */
+ start = end;
+
if (is_open_note (pnote))
{
if (start)

9
binutils.spec
View File

@ -39,7 +39,7 @@
Summary: A GNU collection of binary utilities
Name: binutils%{?name_cross}%{?_with_debug:-debug}
Version: 2.35.1
Release: 34%{?dist}
Release: 35%{?dist}
License: GPLv3+
URL: https://sourceware.org/binutils
@ -337,6 +337,10 @@ Patch35: binutils-CVE-2021-20197.patch
# Lifetime: Fixed in 2.37
Patch36: binutils-ld-DWARF-5-sections.patch
# Purpose: Fix merging empty ppc64le notes.
# Lifetime: Fixed in 2.37
Patch37: binutils-ppc64le-note-merge.patch
#----------------------------------------------------------------------------
Provides: bundled(libiberty)
@ -922,6 +926,9 @@ exit 0
#----------------------------------------------------------------------------
%changelog
* Thu Feb 18 2021 Nick Clifton <nickc@redhat.com> - 2.35.1-35
- Fix merging ppc64le notes. (#1928936)
* Mon Feb 08 2021 Nick Clifton <nickc@redhat.com> - 2.35.1-34
- Extend vulnerability fix again. (#1925779)