Skip to content

Commit d6654a0

Browse files
CBL-Mariner-Botsindhu-karrijslobodzian
authored
[AUTO-CHERRYPICK] [Medium] Fix binutils CVE-2025-1178 - branch main (#12530)
Co-authored-by: sindhu-karri <33163197+sindhu-karri@users.noreply.github.com> Co-authored-by: jslobodzian <joslobo@microsoft.com>
1 parent 59d48e1 commit d6654a0

6 files changed

Lines changed: 51 additions & 13 deletions

File tree

SPECS/binutils/CVE-2025-1178.patch

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
From: Nick Clifton <nickc@redhat.com>
2+
Date: Wed, 5 Feb 2025 13:26:51 +0000
3+
Subject: [PATCH] Prevent an abort in the bfd linker when attempting to
4+
generate dynamic relocs for a corrupt input file.
5+
6+
PR 32638
7+
Patch backported to current version
8+
Source: https://sourceware.org/git/?p=binutils-gdb.git;a=patch;h=75086e9de1707281172cc77f178e7949a4414ed0
9+
---
10+
bfd/elf64-x86-64.c | 9 +++++++++
11+
1 file changed, 9 insertions(+)
12+
13+
diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
14+
index c10f41e0..f7583cf2 100644
15+
--- a/bfd/elf64-x86-64.c
16+
+++ b/bfd/elf64-x86-64.c
17+
@@ -4541,6 +4541,15 @@ elf_x86_64_finish_dynamic_symbol (bfd *output_bfd,
18+
rela.r_addend = 0;
19+
}
20+
21+
+ /* If the relgot section has not been created, then
22+
+ generate an error instead of a reloc. cf PR 32638. */
23+
+ if (relgot == NULL || relgot->size == 0)
24+
+ {
25+
+ info->callbacks->einfo (_("%F%pB: Unable to generate dynamic relocs because a suitable section does not exist\n"),
26+
+ output_bfd);
27+
+ return false;
28+
+ }
29+
+
30+
if (relative_reloc_name != NULL
31+
&& htab->params->report_relative_reloc)
32+
_bfd_x86_elf_link_report_relative_reloc
33+
--
34+
2.33.8

SPECS/binutils/binutils.spec

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
Summary: Contains a linker, an assembler, and other tools
2222
Name: binutils
2323
Version: 2.37
24-
Release: 12%{?dist}
24+
Release: 13%{?dist}
2525
License: GPLv2+
2626
Vendor: Microsoft Corporation
2727
Distribution: Mariner
@@ -49,6 +49,7 @@ Patch14: CVE-2025-0840.patch
4949
Patch15: CVE-2025-1176.patch
5050
Patch16: CVE-2025-1181.patch
5151
Patch17: CVE-2025-1182.patch
52+
Patch18: CVE-2025-1178.patch
5253
Provides: bundled(libiberty)
5354

5455
# Moving macro before the "SourceX" tags breaks PR checks parsing the specs.
@@ -305,6 +306,9 @@ find %{buildroot} -type f -name "*.la" -delete -print
305306
%do_files aarch64-linux-gnu %{build_aarch64}
306307

307308
%changelog
309+
* Mon Feb 17 2025 Sindhu Karri <lakarri@microsoft.com> - 2.37-13
310+
- Fix CVE-2025-1178
311+
308312
* Fri Feb 14 2025 Sindhu Karri <lakarri@microsoft.com> - 2.37-12
309313
- Fix CVE-2025-1176, CVE-2025-1181, CVE-2025-1182
310314

toolkit/resources/manifests/package/pkggen_core_aarch64.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ zlib-devel-1.2.13-2.cm2.aarch64.rpm
1212
file-5.40-3.cm2.aarch64.rpm
1313
file-devel-5.40-3.cm2.aarch64.rpm
1414
file-libs-5.40-3.cm2.aarch64.rpm
15-
binutils-2.37-12.cm2.aarch64.rpm
16-
binutils-devel-2.37-12.cm2.aarch64.rpm
15+
binutils-2.37-13.cm2.aarch64.rpm
16+
binutils-devel-2.37-13.cm2.aarch64.rpm
1717
gmp-6.2.1-4.cm2.aarch64.rpm
1818
gmp-devel-6.2.1-4.cm2.aarch64.rpm
1919
mpfr-4.1.0-2.cm2.aarch64.rpm

toolkit/resources/manifests/package/pkggen_core_x86_64.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ zlib-devel-1.2.13-2.cm2.x86_64.rpm
1212
file-5.40-3.cm2.x86_64.rpm
1313
file-devel-5.40-3.cm2.x86_64.rpm
1414
file-libs-5.40-3.cm2.x86_64.rpm
15-
binutils-2.37-12.cm2.x86_64.rpm
16-
binutils-devel-2.37-12.cm2.x86_64.rpm
15+
binutils-2.37-13.cm2.x86_64.rpm
16+
binutils-devel-2.37-13.cm2.x86_64.rpm
1717
gmp-6.2.1-4.cm2.x86_64.rpm
1818
gmp-devel-6.2.1-4.cm2.x86_64.rpm
1919
mpfr-4.1.0-2.cm2.x86_64.rpm

toolkit/resources/manifests/package/toolchain_aarch64.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ bash-5.1.8-4.cm2.aarch64.rpm
99
bash-debuginfo-5.1.8-4.cm2.aarch64.rpm
1010
bash-devel-5.1.8-4.cm2.aarch64.rpm
1111
bash-lang-5.1.8-4.cm2.aarch64.rpm
12-
binutils-2.37-12.cm2.aarch64.rpm
13-
binutils-debuginfo-2.37-12.cm2.aarch64.rpm
14-
binutils-devel-2.37-12.cm2.aarch64.rpm
12+
binutils-2.37-13.cm2.aarch64.rpm
13+
binutils-debuginfo-2.37-13.cm2.aarch64.rpm
14+
binutils-devel-2.37-13.cm2.aarch64.rpm
1515
bison-3.7.6-2.cm2.aarch64.rpm
1616
bison-debuginfo-3.7.6-2.cm2.aarch64.rpm
1717
bzip2-1.0.8-1.cm2.aarch64.rpm

toolkit/resources/manifests/package/toolchain_x86_64.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ bash-5.1.8-4.cm2.x86_64.rpm
99
bash-debuginfo-5.1.8-4.cm2.x86_64.rpm
1010
bash-devel-5.1.8-4.cm2.x86_64.rpm
1111
bash-lang-5.1.8-4.cm2.x86_64.rpm
12-
binutils-2.37-12.cm2.x86_64.rpm
13-
binutils-aarch64-linux-gnu-2.37-12.cm2.x86_64.rpm
14-
binutils-debuginfo-2.37-12.cm2.x86_64.rpm
15-
binutils-devel-2.37-12.cm2.x86_64.rpm
12+
binutils-2.37-13.cm2.x86_64.rpm
13+
binutils-aarch64-linux-gnu-2.37-13.cm2.x86_64.rpm
14+
binutils-debuginfo-2.37-13.cm2.x86_64.rpm
15+
binutils-devel-2.37-13.cm2.x86_64.rpm
1616
bison-3.7.6-2.cm2.x86_64.rpm
1717
bison-debuginfo-3.7.6-2.cm2.x86_64.rpm
1818
bzip2-1.0.8-1.cm2.x86_64.rpm
@@ -47,7 +47,7 @@ cracklib-lang-2.9.7-5.cm2.x86_64.rpm
4747
createrepo_c-0.17.5-1.cm2.x86_64.rpm
4848
createrepo_c-debuginfo-0.17.5-1.cm2.x86_64.rpm
4949
createrepo_c-devel-0.17.5-1.cm2.x86_64.rpm
50-
cross-binutils-common-2.37-12.cm2.noarch.rpm
50+
cross-binutils-common-2.37-13.cm2.noarch.rpm
5151
cross-gcc-common-11.2.0-8.cm2.noarch.rpm
5252
curl-8.8.0-4.cm2.x86_64.rpm
5353
curl-debuginfo-8.8.0-4.cm2.x86_64.rpm

0 commit comments

Comments
 (0)