diff options
3 files changed, 41 insertions, 45 deletions
diff --git a/meta/recipes-devtools/binutils/binutils-2.34.inc b/meta/recipes-devtools/binutils/binutils-2.34.inc index ff0d467132..713e428a3e 100644 --- a/meta/recipes-devtools/binutils/binutils-2.34.inc +++ b/meta/recipes-devtools/binutils/binutils-2.34.inc | |||
@@ -24,7 +24,7 @@ BRANCH ?= "binutils-2_34-branch" | |||
24 | 24 | ||
25 | UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)" | 25 | UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)" |
26 | 26 | ||
27 | SRCREV ?= "d4b50999b3b287b5f984ade2f8734aa8c9359440" | 27 | SRCREV ?= "c4e78c0868a22971680217a41fdb73516a26813d" |
28 | BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${BRANCH};protocol=git" | 28 | BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${BRANCH};protocol=git" |
29 | SRC_URI = "\ | 29 | SRC_URI = "\ |
30 | ${BINUTILS_GIT_URI} \ | 30 | ${BINUTILS_GIT_URI} \ |
diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2020-16593.patch b/meta/recipes-devtools/binutils/binutils/CVE-2020-16593.patch index cbe4a50507..c7c7829261 100644 --- a/meta/recipes-devtools/binutils/binutils/CVE-2020-16593.patch +++ b/meta/recipes-devtools/binutils/binutils/CVE-2020-16593.patch | |||
@@ -199,6 +199,6 @@ Index: git/bfd/ChangeLog | |||
199 | + * dwarf2.c (scan_unit_for_symbols): Wrap overlong lines. Don't | 199 | + * dwarf2.c (scan_unit_for_symbols): Wrap overlong lines. Don't |
200 | + strdup(0). | 200 | + strdup(0). |
201 | + | 201 | + |
202 | 2020-02-19 H.J. Lu <hongjiu.lu@intel.com> | 202 | 2021-05-03 Alan Modra <amodra@gmail.com> |
203 | 203 | ||
204 | PR binutils/25355 | 204 | PR 27755 |
diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2021-3549.patch b/meta/recipes-devtools/binutils/binutils/CVE-2021-3549.patch index 4391db340a..5f56dd7696 100644 --- a/meta/recipes-devtools/binutils/binutils/CVE-2021-3549.patch +++ b/meta/recipes-devtools/binutils/binutils/CVE-2021-3549.patch | |||
@@ -7,31 +7,49 @@ Adds missing sanity checks for avr device info note, to avoid | |||
7 | potential buffer overflows. Uses bfd_malloc_and_get_section for | 7 | potential buffer overflows. Uses bfd_malloc_and_get_section for |
8 | sanity checking section size. | 8 | sanity checking section size. |
9 | 9 | ||
10 | PR 27290 | 10 | PR 27290 |
11 | PR 27293 | 11 | PR 27293 |
12 | PR 27295 | 12 | PR 27295 |
13 | * od-elf32_avr.c (elf32_avr_get_note_section_contents): Formatting. | 13 | * od-elf32_avr.c (elf32_avr_get_note_section_contents): Formatting. |
14 | Use bfd_malloc_and_get_section. | 14 | Use bfd_malloc_and_get_section. |
15 | (elf32_avr_get_note_desc): Formatting. Return descsz. Sanity | 15 | (elf32_avr_get_note_desc): Formatting. Return descsz. Sanity |
16 | check namesz. Return NULL if descsz is too small. Ensure | 16 | check namesz. Return NULL if descsz is too small. Ensure |
17 | string table is terminated. | 17 | string table is terminated. |
18 | (elf32_avr_get_device_info): Formatting. Add note_size param. | 18 | (elf32_avr_get_device_info): Formatting. Add note_size param. |
19 | Sanity check note. | 19 | Sanity check note. |
20 | (elf32_avr_dump_mem_usage): Adjust to suit. | 20 | (elf32_avr_dump_mem_usage): Adjust to suit. |
21 | 21 | ||
22 | Upstream-Status: Backport | 22 | Upstream-Status: Backport |
23 | CVE: CVE-2021-3549 | 23 | CVE: CVE-2021-3549 |
24 | Signed-of-by: Armin Kuster <akuster@mvista.com> | 24 | Signed-of-by: Armin Kuster <akuster@mvista.com> |
25 | 25 | ||
26 | --- | 26 | --- |
27 | binutils/ChangeLog | 14 +++++++++ | 27 | diff --git a/binutils/ChangeLog b/binutils/ChangeLog |
28 | binutils/od-elf32_avr.c | 66 ++++++++++++++++++++++++++--------------- | 28 | index 1e9a96c9bb6..02e5019204e 100644 |
29 | 2 files changed, 56 insertions(+), 24 deletions(-) | 29 | --- a/binutils/ChangeLog |
30 | 30 | +++ b/binutils/ChangeLog | |
31 | Index: git/binutils/od-elf32_avr.c | 31 | @@ -1,3 +1,17 @@ |
32 | =================================================================== | 32 | +2021-02-11 Alan Modra <amodra@gmail.com> |
33 | --- git.orig/binutils/od-elf32_avr.c | 33 | + |
34 | +++ git/binutils/od-elf32_avr.c | 34 | + PR 27290 |
35 | + PR 27293 | ||
36 | + PR 27295 | ||
37 | + * od-elf32_avr.c (elf32_avr_get_note_section_contents): Formatting. | ||
38 | + Use bfd_malloc_and_get_section. | ||
39 | + (elf32_avr_get_note_desc): Formatting. Return descsz. Sanity | ||
40 | + check namesz. Return NULL if descsz is too small. Ensure | ||
41 | + string table is terminated. | ||
42 | + (elf32_avr_get_device_info): Formatting. Add note_size param. | ||
43 | + Sanity check note. | ||
44 | + (elf32_avr_dump_mem_usage): Adjust to suit. | ||
45 | + | ||
46 | 2020-03-25 H.J. Lu <hongjiu.lu@intel.com> | ||
47 | |||
48 | * ar.c (main): Update bfd_plugin_set_program_name call. | ||
49 | diff --git a/binutils/od-elf32_avr.c b/binutils/od-elf32_avr.c | ||
50 | index 5ec99957fe9..1d32bce918e 100644 | ||
51 | --- a/binutils/od-elf32_avr.c | ||
52 | +++ b/binutils/od-elf32_avr.c | ||
35 | @@ -77,23 +77,29 @@ elf32_avr_filter (bfd *abfd) | 53 | @@ -77,23 +77,29 @@ elf32_avr_filter (bfd *abfd) |
36 | return bfd_get_flavour (abfd) == bfd_target_elf_flavour; | 54 | return bfd_get_flavour (abfd) == bfd_target_elf_flavour; |
37 | } | 55 | } |
@@ -70,7 +88,7 @@ Index: git/binutils/od-elf32_avr.c | |||
70 | { | 88 | { |
71 | Elf_External_Note *xnp = (Elf_External_Note *) contents; | 89 | Elf_External_Note *xnp = (Elf_External_Note *) contents; |
72 | Elf_Internal_Note in; | 90 | Elf_Internal_Note in; |
73 | @@ -107,42 +113,54 @@ static char* elf32_avr_get_note_desc (bf | 91 | @@ -107,42 +113,54 @@ static char* elf32_avr_get_note_desc (bfd *abfd, char *contents, |
74 | if (in.namesz > contents - in.namedata + size) | 92 | if (in.namesz > contents - in.namedata + size) |
75 | return NULL; | 93 | return NULL; |
76 | 94 | ||
@@ -163,25 +181,3 @@ Index: git/binutils/od-elf32_avr.c | |||
163 | } | 181 | } |
164 | 182 | ||
165 | elf32_avr_get_memory_usage (abfd, &text_usage, &data_usage, | 183 | elf32_avr_get_memory_usage (abfd, &text_usage, &data_usage, |
166 | Index: git/binutils/ChangeLog | ||
167 | =================================================================== | ||
168 | --- git.orig/binutils/ChangeLog | ||
169 | +++ git/binutils/ChangeLog | ||
170 | @@ -1,3 +1,17 @@ | ||
171 | +2021-02-11 Alan Modra <amodra@gmail.com> | ||
172 | + | ||
173 | + PR 27290 | ||
174 | + PR 27293 | ||
175 | + PR 27295 | ||
176 | + * od-elf32_avr.c (elf32_avr_get_note_section_contents): Formatting. | ||
177 | + Use bfd_malloc_and_get_section. | ||
178 | + (elf32_avr_get_note_desc): Formatting. Return descsz. Sanity | ||
179 | + check namesz. Return NULL if descsz is too small. Ensure | ||
180 | + string table is terminated. | ||
181 | + (elf32_avr_get_device_info): Formatting. Add note_size param. | ||
182 | + Sanity check note. | ||
183 | + (elf32_avr_dump_mem_usage): Adjust to suit. | ||
184 | + | ||
185 | 2020-02-01 Nick Clifton <nickc@redhat.com> | ||
186 | |||
187 | * configure: Regenerate. | ||