diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2014-10-02 15:27:27 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-10-02 16:39:42 +0100 |
commit | 634b753f8458c34b0df971084d6cb71ff8e62815 (patch) | |
tree | 9ed0ab038952ab7541f32596b76fcbd6ef5086b4 | |
parent | 5881ef9299fcfe3ca983f95614abb22ce14ab082 (diff) | |
download | poky-634b753f8458c34b0df971084d6cb71ff8e62815.tar.gz |
bash: add missing patch for CVE-2014-7169 to 4.2 recipe
The bash_4.2 recipe was missed when the fix was backported to the dora
branch.
Patch from OE-Core master rev: 76a2d6b83472995edbe967aed80f0fcbb784b3fc
by Khem Raj <raj.khem@gmail.com>
(From OE-Core rev: a71680ec6e12c17159336dc34d904cb70155d0d7)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-extended/bash/bash-4.2/cve-2014-7169.patch | 16 | ||||
-rw-r--r-- | meta/recipes-extended/bash/bash_4.2.bb | 1 |
2 files changed, 17 insertions, 0 deletions
diff --git a/meta/recipes-extended/bash/bash-4.2/cve-2014-7169.patch b/meta/recipes-extended/bash/bash-4.2/cve-2014-7169.patch new file mode 100644 index 0000000000..3c69121767 --- /dev/null +++ b/meta/recipes-extended/bash/bash-4.2/cve-2014-7169.patch | |||
@@ -0,0 +1,16 @@ | |||
1 | Taken from http://www.openwall.com/lists/oss-security/2016/09/25/10 | ||
2 | |||
3 | Upstream-Status: Backport | ||
4 | Index: bash-4.3/parse.y | ||
5 | =================================================================== | ||
6 | --- bash-4.3.orig/parse.y 2014-09-26 13:10:44.340080056 -0700 | ||
7 | +++ bash-4.3/parse.y 2014-09-26 13:11:44.764080056 -0700 | ||
8 | @@ -2953,6 +2953,8 @@ | ||
9 | FREE (word_desc_to_read); | ||
10 | word_desc_to_read = (WORD_DESC *)NULL; | ||
11 | |||
12 | + eol_ungetc_lookahead = 0; | ||
13 | + | ||
14 | current_token = '\n'; /* XXX */ | ||
15 | last_read_token = '\n'; | ||
16 | token_to_read = '\n'; | ||
diff --git a/meta/recipes-extended/bash/bash_4.2.bb b/meta/recipes-extended/bash/bash_4.2.bb index cb95445fc8..e3fa39dece 100644 --- a/meta/recipes-extended/bash/bash_4.2.bb +++ b/meta/recipes-extended/bash/bash_4.2.bb | |||
@@ -22,6 +22,7 @@ SRC_URI = "${GNU_MIRROR}/bash/${BPN}-${PV}.tar.gz;name=tarball \ | |||
22 | file://build-tests.patch \ | 22 | file://build-tests.patch \ |
23 | file://test-output.patch \ | 23 | file://test-output.patch \ |
24 | file://cve-2014-6271.patch;striplevel=0 \ | 24 | file://cve-2014-6271.patch;striplevel=0 \ |
25 | file://cve-2014-7169.patch \ | ||
25 | file://run-ptest \ | 26 | file://run-ptest \ |
26 | " | 27 | " |
27 | 28 | ||