Browse code
BUG 2133426 : Fix for [CVE-2018-10373] in binutils for 2.0
Add a NULL check for table pointer before attempting to
compute a DWARF filename.
Change-Id: Ie578617fa2214cfe38c7bfcc3d320c5edf917f60
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/5258
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Tapas Kundu <tkundu@vmware.com>
Reviewed-by: Sharath George
Keerthana K authored on 2018/06/13 22:17:06Showing 2 changed files
| 1 | 1 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,15 @@ |
| 0 |
+diff --git a/bfd/dwarf2.c b/bfd/dwarf2.c |
|
| 1 |
+index ca22db7..0f8257f 100644 |
|
| 2 |
+--- a/bfd/dwarf2.c |
|
| 3 |
+@@ -1566,7 +1566,7 @@ concat_filename (struct line_info_table *table, unsigned int file) |
|
| 4 |
+ {
|
|
| 5 |
+ char *filename; |
|
| 6 |
+ |
|
| 7 |
+- if (file - 1 >= table->num_files) |
|
| 8 |
++ if (table == NULL || file - 1 >= table->num_files) |
|
| 9 |
+ {
|
|
| 10 |
+ /* FILE == 0 means unknown. */ |
|
| 11 |
+ if (file) |
|
| 12 |
+-- |
|
| 13 |
+2.9.3 |
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: Contains a linker, an assembler, and other tools |
| 2 | 2 |
Name: binutils |
| 3 | 3 |
Version: 2.30 |
| 4 |
-Release: 4%{?dist}
|
|
| 4 |
+Release: 5%{?dist}
|
|
| 5 | 5 |
License: GPLv2+ |
| 6 | 6 |
URL: http://www.gnu.org/software/binutils |
| 7 | 7 |
Group: System Environment/Base |
| ... | ... |
@@ -12,6 +12,7 @@ Source0: http://ftp.gnu.org/gnu/binutils/%{name}-%{version}.tar.xz
|
| 12 | 12 |
Patch0: binutils-2.30-CVE-2018-6543.patch |
| 13 | 13 |
Patch1: binutils-2.30-CVE-2018-7643.patch |
| 14 | 14 |
Patch2: binutils-2.30-CVE-2018-7208.patch |
| 15 |
+Patch3: binutils-2.30-CVE-2018-10373.patch |
|
| 15 | 16 |
%description |
| 16 | 17 |
The Binutils package contains a linker, an assembler, |
| 17 | 18 |
and other tools for handling object files. |
| ... | ... |
@@ -26,6 +27,7 @@ for handling compiled objects. |
| 26 | 26 |
%patch0 -p1 |
| 27 | 27 |
%patch1 -p1 |
| 28 | 28 |
%patch2 -p1 |
| 29 |
+%patch3 -p1 |
|
| 29 | 30 |
|
| 30 | 31 |
%build |
| 31 | 32 |
install -vdm 755 ../binutils-build |
| ... | ... |
@@ -116,6 +118,8 @@ make %{?_smp_mflags} check
|
| 116 | 116 |
%{_lib64dir}/libiberty.a
|
| 117 | 117 |
|
| 118 | 118 |
%changelog |
| 119 |
+* Thu Jun 12 2018 Keerthana K <keerthanak@vmware.com> 2.30-5 |
|
| 120 |
+- Fix CVE-2018-10373 |
|
| 119 | 121 |
* Tue Apr 17 2018 Xiaolin Li <xiaolinl@vmware.com> 2.30-4 |
| 120 | 122 |
- Fix CVE-2018-7643, CVE-2018-7208 |
| 121 | 123 |
* Mon Mar 19 2018 Alexey Makhalov <amakhalov@vmware.com> 2.30-3 |