diff options
Diffstat (limited to 'meta/recipes-devtools/binutils')
-rw-r--r-- | meta/recipes-devtools/binutils/binutils-2.27.inc | 1 | ||||
-rw-r--r-- | meta/recipes-devtools/binutils/binutils/CVE-2017-9038.patch | 51 |
2 files changed, 52 insertions, 0 deletions
diff --git a/meta/recipes-devtools/binutils/binutils-2.27.inc b/meta/recipes-devtools/binutils/binutils-2.27.inc index 22f02e9349..a117323282 100644 --- a/meta/recipes-devtools/binutils/binutils-2.27.inc +++ b/meta/recipes-devtools/binutils/binutils-2.27.inc | |||
@@ -46,6 +46,7 @@ SRC_URI = "\ | |||
46 | file://CVE-2017-7209.patch \ | 46 | file://CVE-2017-7209.patch \ |
47 | file://CVE-2017-7210.patch \ | 47 | file://CVE-2017-7210.patch \ |
48 | file://CVE-2017-7614.patch \ | 48 | file://CVE-2017-7614.patch \ |
49 | file://CVE-2017-9038.patch \ | ||
49 | " | 50 | " |
50 | S = "${WORKDIR}/git" | 51 | S = "${WORKDIR}/git" |
51 | 52 | ||
diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2017-9038.patch b/meta/recipes-devtools/binutils/binutils/CVE-2017-9038.patch new file mode 100644 index 0000000000..afc14d1e14 --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils/CVE-2017-9038.patch | |||
@@ -0,0 +1,51 @@ | |||
1 | From f32ba72991d2406b21ab17edc234a2f3fa7fb23d Mon Sep 17 00:00:00 2001 | ||
2 | From: Nick Clifton <nickc@redhat.com> | ||
3 | Date: Mon, 3 Apr 2017 11:01:45 +0100 | ||
4 | Subject: [PATCH] readelf: Update check for invalid word offsets in ARM unwind | ||
5 | information. | ||
6 | |||
7 | PR binutils/21343 | ||
8 | * readelf.c (get_unwind_section_word): Fix snafu checking for | ||
9 | invalid word offsets in ARM unwind information. | ||
10 | |||
11 | Upstream-Status: Backport | ||
12 | CVE: CVE-2017-9039 | ||
13 | Affects: binutils <= 2.28 | ||
14 | Signed-off-by: Armin Kuster <akuster@mvista.com> | ||
15 | |||
16 | --- | ||
17 | binutils/ChangeLog | 6 ++++++ | ||
18 | binutils/readelf.c | 6 +++--- | ||
19 | 2 files changed, 9 insertions(+), 3 deletions(-) | ||
20 | |||
21 | Index: git/binutils/readelf.c | ||
22 | =================================================================== | ||
23 | --- git.orig/binutils/readelf.c | ||
24 | +++ git/binutils/readelf.c | ||
25 | @@ -7745,9 +7745,9 @@ get_unwind_section_word (struct arm_unw_ | ||
26 | return FALSE; | ||
27 | |||
28 | /* If the offset is invalid then fail. */ | ||
29 | - if (word_offset > (sec->sh_size - 4) | ||
30 | - /* PR 18879 */ | ||
31 | - || (sec->sh_size < 5 && word_offset >= sec->sh_size) | ||
32 | + if (/* PR 21343 *//* PR 18879 */ | ||
33 | + sec->sh_size < 4 | ||
34 | + || word_offset > (sec->sh_size - 4) | ||
35 | || ((bfd_signed_vma) word_offset) < 0) | ||
36 | return FALSE; | ||
37 | |||
38 | Index: git/bfd/ChangeLog | ||
39 | =================================================================== | ||
40 | --- git.orig/bfd/ChangeLog | ||
41 | +++ git/bfd/ChangeLog | ||
42 | @@ -1,3 +1,9 @@ | ||
43 | +2017-04-03 Nick Clifton <nickc@redhat.com> | ||
44 | + | ||
45 | + PR binutils/21343 | ||
46 | + * readelf.c (get_unwind_section_word): Fix snafu checking for | ||
47 | + invalid word offsets in ARM unwind information. | ||
48 | + | ||
49 | 2017-04-04 Nick Clifton <nickc@redhat.com> | ||
50 | |||
51 | PR binutils/21342 | ||