Blame binutils-CVE-2018-6323.patch
|
Nick Clifton |
f53b23 |
--- binutils.orig/bfd/elfcode.h 2018-05-01 11:42:03.250424443 +0100
|
|
Nick Clifton |
f53b23 |
+++ binutils-2.30/bfd/elfcode.h 2018-05-01 12:41:00.745780026 +0100
|
|
Nick Clifton |
f53b23 |
@@ -680,7 +680,7 @@ elf_object_p (bfd *abfd)
|
|
Nick Clifton |
f53b23 |
if (i_ehdrp->e_shnum > ((bfd_size_type) -1) / sizeof (*i_shdrp))
|
|
Nick Clifton |
f53b23 |
goto got_wrong_format_error;
|
|
Nick Clifton |
f53b23 |
#endif
|
|
Nick Clifton |
f53b23 |
- amt = sizeof (*i_shdrp) * i_ehdrp->e_shnum;
|
|
Nick Clifton |
f53b23 |
+ amt = sizeof (*i_shdrp) * (bfd_size_type) i_ehdrp->e_shnum;
|
|
Nick Clifton |
f53b23 |
i_shdrp = (Elf_Internal_Shdr *) bfd_alloc (abfd, amt);
|
|
Nick Clifton |
f53b23 |
if (!i_shdrp)
|
|
Nick Clifton |
f53b23 |
goto got_no_match;
|
|
Nick Clifton |
f53b23 |
@@ -776,7 +776,7 @@ elf_object_p (bfd *abfd)
|
|
Nick Clifton |
f53b23 |
if (i_ehdrp->e_phnum > ((bfd_size_type) -1) / sizeof (*i_phdr))
|
|
Nick Clifton |
f53b23 |
goto got_wrong_format_error;
|
|
Nick Clifton |
f53b23 |
#endif
|
|
Nick Clifton |
f53b23 |
- amt = i_ehdrp->e_phnum * sizeof (*i_phdr);
|
|
Nick Clifton |
f53b23 |
+ amt = (bfd_size_type) i_ehdrp->e_phnum * sizeof (*i_phdr);
|
|
Nick Clifton |
f53b23 |
elf_tdata (abfd)->phdr = (Elf_Internal_Phdr *) bfd_alloc (abfd, amt);
|
|
Nick Clifton |
f53b23 |
if (elf_tdata (abfd)->phdr == NULL)
|
|
Nick Clifton |
f53b23 |
goto got_no_match;
|