diff options
Diffstat (limited to 'meta/recipes-devtools/binutils')
-rw-r--r-- | meta/recipes-devtools/binutils/binutils-2.29.1.inc | 1 | ||||
-rw-r--r-- | meta/recipes-devtools/binutils/binutils/CVE-2017-14940.patch | 47 |
2 files changed, 48 insertions, 0 deletions
diff --git a/meta/recipes-devtools/binutils/binutils-2.29.1.inc b/meta/recipes-devtools/binutils/binutils-2.29.1.inc index 4abfbbf76b..bd25a525be 100644 --- a/meta/recipes-devtools/binutils/binutils-2.29.1.inc +++ b/meta/recipes-devtools/binutils/binutils-2.29.1.inc | |||
@@ -43,6 +43,7 @@ SRC_URI = "\ | |||
43 | file://CVE-2017-14934.patch \ | 43 | file://CVE-2017-14934.patch \ |
44 | file://CVE-2017-14938.patch \ | 44 | file://CVE-2017-14938.patch \ |
45 | file://CVE-2017-14939.patch \ | 45 | file://CVE-2017-14939.patch \ |
46 | file://CVE-2017-14940.patch \ | ||
46 | " | 47 | " |
47 | S = "${WORKDIR}/git" | 48 | S = "${WORKDIR}/git" |
48 | 49 | ||
diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2017-14940.patch b/meta/recipes-devtools/binutils/binutils/CVE-2017-14940.patch new file mode 100644 index 0000000000..49b0bdc546 --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils/CVE-2017-14940.patch | |||
@@ -0,0 +1,47 @@ | |||
1 | From 0d76029f92182c3682d8be2c833d45bc9a2068fe Mon Sep 17 00:00:00 2001 | ||
2 | From: Alan Modra <amodra@gmail.com> | ||
3 | Date: Sun, 24 Sep 2017 14:35:33 +0930 | ||
4 | Subject: [PATCH] PR22167, NULL pointer dereference in scan_unit_for_symbols | ||
5 | |||
6 | PR 22167 | ||
7 | * dwarf2.c (scan_unit_for_symbols): Check u.blk->data is non-NULL. | ||
8 | |||
9 | Upstream-Status: Backport | ||
10 | Affects: <= 2.29.1 | ||
11 | CVE: CVE-2017-14940 | ||
12 | Signed-off-by: Armin Kuster <akuster@mvista.com> | ||
13 | |||
14 | --- | ||
15 | bfd/ChangeLog | 5 +++++ | ||
16 | bfd/dwarf2.c | 3 ++- | ||
17 | 2 files changed, 7 insertions(+), 1 deletion(-) | ||
18 | |||
19 | Index: git/bfd/dwarf2.c | ||
20 | =================================================================== | ||
21 | --- git.orig/bfd/dwarf2.c | ||
22 | +++ git/bfd/dwarf2.c | ||
23 | @@ -3202,7 +3202,8 @@ scan_unit_for_symbols (struct comp_unit | ||
24 | case DW_FORM_block2: | ||
25 | case DW_FORM_block4: | ||
26 | case DW_FORM_exprloc: | ||
27 | - if (*attr.u.blk->data == DW_OP_addr) | ||
28 | + if (attr.u.blk->data != NULL | ||
29 | + && *attr.u.blk->data == DW_OP_addr) | ||
30 | { | ||
31 | var->stack = 0; | ||
32 | |||
33 | Index: git/bfd/ChangeLog | ||
34 | =================================================================== | ||
35 | --- git.orig/bfd/ChangeLog | ||
36 | +++ git/bfd/ChangeLog | ||
37 | @@ -1,5 +1,10 @@ | ||
38 | 2017-09-24 Alan Modra <amodra@gmail.com> | ||
39 | |||
40 | + PR 22167 | ||
41 | + * dwarf2.c (scan_unit_for_symbols): Check u.blk->data is non-NULL. | ||
42 | + | ||
43 | +2017-09-24 Alan Modra <amodra@gmail.com> | ||
44 | + | ||
45 | PR 22169 | ||
46 | * dwarf2.c (decode_line_info): Correct .debug_line unit_length check. | ||
47 | |||