diff options
Diffstat (limited to 'meta/recipes-devtools/binutils/binutils/CVE-2017-7299_2.patch')
-rw-r--r-- | meta/recipes-devtools/binutils/binutils/CVE-2017-7299_2.patch | 120 |
1 files changed, 120 insertions, 0 deletions
diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2017-7299_2.patch b/meta/recipes-devtools/binutils/binutils/CVE-2017-7299_2.patch new file mode 100644 index 0000000000..7691b122ce --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils/CVE-2017-7299_2.patch | |||
@@ -0,0 +1,120 @@ | |||
1 | commit a961cdd5f139d3c3e09170db52bd8df7dafae13f | ||
2 | Author: Alan Modra <amodra@gmail.com> | ||
3 | Date: Thu Dec 15 21:29:44 2016 +1030 | ||
4 | |||
5 | Linking non-ELF file broken by PR20908 fix | ||
6 | |||
7 | PR ld/20968 | ||
8 | PR ld/20908 | ||
9 | * elflink.c (bfd_elf_final_link): Revert 2016-12-02 change. Move | ||
10 | reloc counting code later after ELF flavour test. | ||
11 | |||
12 | Upstream-Status: Backport | ||
13 | |||
14 | CVE: CVE-2017-7299 | ||
15 | Signed-off-by: Thiruvadi Rajaraman <trajaraman@mvista.com> | ||
16 | |||
17 | Index: git/bfd/elflink.c | ||
18 | =================================================================== | ||
19 | --- git.orig/bfd/elflink.c 2017-09-20 14:15:28.133343092 +0530 | ||
20 | +++ git/bfd/elflink.c 2017-09-20 14:15:28.189343391 +0530 | ||
21 | @@ -11201,13 +11201,6 @@ | ||
22 | asection *sec; | ||
23 | |||
24 | sec = p->u.indirect.section; | ||
25 | - /* See PR 20908 for a reproducer. */ | ||
26 | - if (bfd_get_flavour (sec->owner) != bfd_target_elf_flavour) | ||
27 | - { | ||
28 | - _bfd_error_handler (_("%B: not in ELF format"), sec->owner); | ||
29 | - goto error_return; | ||
30 | - } | ||
31 | - esdi = elf_section_data (sec); | ||
32 | |||
33 | /* Mark all sections which are to be included in the | ||
34 | link. This will normally be every section. We need | ||
35 | @@ -11218,37 +11211,18 @@ | ||
36 | if (sec->flags & SEC_MERGE) | ||
37 | merged = TRUE; | ||
38 | |||
39 | - if (esdo->this_hdr.sh_type == SHT_REL | ||
40 | - || esdo->this_hdr.sh_type == SHT_RELA) | ||
41 | - /* Some backends use reloc_count in relocation sections | ||
42 | - to count particular types of relocs. Of course, | ||
43 | - reloc sections themselves can't have relocations. */ | ||
44 | - reloc_count = 0; | ||
45 | - else if (emit_relocs) | ||
46 | - { | ||
47 | - reloc_count = sec->reloc_count; | ||
48 | - if (bed->elf_backend_count_additional_relocs) | ||
49 | - { | ||
50 | - int c; | ||
51 | - c = (*bed->elf_backend_count_additional_relocs) (sec); | ||
52 | - additional_reloc_count += c; | ||
53 | - } | ||
54 | - } | ||
55 | - else if (bed->elf_backend_count_relocs) | ||
56 | - reloc_count = (*bed->elf_backend_count_relocs) (info, sec); | ||
57 | - | ||
58 | if (sec->rawsize > max_contents_size) | ||
59 | max_contents_size = sec->rawsize; | ||
60 | if (sec->size > max_contents_size) | ||
61 | max_contents_size = sec->size; | ||
62 | |||
63 | - /* We are interested in just local symbols, not all | ||
64 | - symbols. */ | ||
65 | if (bfd_get_flavour (sec->owner) == bfd_target_elf_flavour | ||
66 | && (sec->owner->flags & DYNAMIC) == 0) | ||
67 | { | ||
68 | size_t sym_count; | ||
69 | |||
70 | + /* We are interested in just local symbols, not all | ||
71 | + symbols. */ | ||
72 | if (elf_bad_symtab (sec->owner)) | ||
73 | sym_count = (elf_tdata (sec->owner)->symtab_hdr.sh_size | ||
74 | / bed->s->sizeof_sym); | ||
75 | @@ -11262,6 +11236,27 @@ | ||
76 | && elf_symtab_shndx_list (sec->owner) != NULL) | ||
77 | max_sym_shndx_count = sym_count; | ||
78 | |||
79 | + if (esdo->this_hdr.sh_type == SHT_REL | ||
80 | + || esdo->this_hdr.sh_type == SHT_RELA) | ||
81 | + /* Some backends use reloc_count in relocation sections | ||
82 | + to count particular types of relocs. Of course, | ||
83 | + reloc sections themselves can't have relocations. */ | ||
84 | + ; | ||
85 | + else if (emit_relocs) | ||
86 | + { | ||
87 | + reloc_count = sec->reloc_count; | ||
88 | + if (bed->elf_backend_count_additional_relocs) | ||
89 | + { | ||
90 | + int c; | ||
91 | + c = (*bed->elf_backend_count_additional_relocs) (sec); | ||
92 | + additional_reloc_count += c; | ||
93 | + } | ||
94 | + } | ||
95 | + else if (bed->elf_backend_count_relocs) | ||
96 | + reloc_count = (*bed->elf_backend_count_relocs) (info, sec); | ||
97 | + | ||
98 | + esdi = elf_section_data (sec); | ||
99 | + | ||
100 | if ((sec->flags & SEC_RELOC) != 0) | ||
101 | { | ||
102 | size_t ext_size = 0; | ||
103 | Index: git/bfd/ChangeLog | ||
104 | =================================================================== | ||
105 | --- git.orig/bfd/ChangeLog 2017-09-20 14:15:28.013342453 +0530 | ||
106 | +++ git/bfd/ChangeLog 2017-09-20 14:19:06.990419395 +0530 | ||
107 | @@ -156,6 +156,13 @@ | ||
108 | (bfd_elf_final_link): Only initialize the extended symbol index | ||
109 | section if there are extended symbol tables to list. | ||
110 | |||
111 | +2016-12-15 Alan Modra <amodra@gmail.com> | ||
112 | + | ||
113 | + PR ld/20968 | ||
114 | + PR ld/20908 | ||
115 | + * elflink.c (bfd_elf_final_link): Revert 2016-12-02 change. Move | ||
116 | + reloc counting code later after ELF flavour test. | ||
117 | + | ||
118 | 2016-12-06 Nick Clifton <nickc@redhat.com> | ||
119 | |||
120 | PR binutils/20931 | ||