diff options
author | Khem Raj <raj.khem@gmail.com> | 2014-09-26 13:21:19 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-10-02 12:48:10 +0100 |
commit | 51477e3c54cccf27b65d071dd310732d36072357 (patch) | |
tree | 7407362b2e04ea719db2488fa27dd2ea05858e2f | |
parent | 3bde5804e329b582739414caf2c1534b6ab1ee3d (diff) | |
download | poky-51477e3c54cccf27b65d071dd310732d36072357.tar.gz |
bash: Fix CVE-2014-7169
This is a followup patch to incomplete CVE-2014-6271 fix
code execution via specially-crafted environment
Change-Id: Ibb0a587ee6e09b8174e92d005356e822ad40d4ed
(From OE-Core master rev: 76a2d6b83472995edbe967aed80f0fcbb784b3fc)
(From OE-Core rev: 1c8f43767c7d78872d38652ea808f30ea825bbef)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-extended/bash/bash-3.2.48/cve-2014-7169.patch | 16 | ||||
-rw-r--r-- | meta/recipes-extended/bash/bash_3.2.48.bb | 1 |
2 files changed, 17 insertions, 0 deletions
diff --git a/meta/recipes-extended/bash/bash-3.2.48/cve-2014-7169.patch b/meta/recipes-extended/bash/bash-3.2.48/cve-2014-7169.patch new file mode 100644 index 0000000000..2e734de434 --- /dev/null +++ b/meta/recipes-extended/bash/bash-3.2.48/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-3.2.48/parse.y | ||
5 | =================================================================== | ||
6 | --- bash-3.2.48.orig/parse.y 2008-04-29 18:24:55.000000000 -0700 | ||
7 | +++ bash-3.2.48/parse.y 2014-09-26 13:07:31.956080056 -0700 | ||
8 | @@ -2503,6 +2503,8 @@ | ||
9 | FREE (word_desc_to_read); | ||
10 | word_desc_to_read = (WORD_DESC *)NULL; | ||
11 | |||
12 | + eol_ungetc_lookahead = 0; | ||
13 | + | ||
14 | last_read_token = '\n'; | ||
15 | token_to_read = '\n'; | ||
16 | } | ||
diff --git a/meta/recipes-extended/bash/bash_3.2.48.bb b/meta/recipes-extended/bash/bash_3.2.48.bb index 5849ed0169..e6a04cd888 100644 --- a/meta/recipes-extended/bash/bash_3.2.48.bb +++ b/meta/recipes-extended/bash/bash_3.2.48.bb | |||
@@ -13,6 +13,7 @@ SRC_URI = "${GNU_MIRROR}/bash/bash-${PV}.tar.gz;name=tarball \ | |||
13 | file://build-tests.patch \ | 13 | file://build-tests.patch \ |
14 | file://test-output.patch \ | 14 | file://test-output.patch \ |
15 | file://cve-2014-6271.patch;striplevel=0 \ | 15 | file://cve-2014-6271.patch;striplevel=0 \ |
16 | file://cve-2014-7169.patch \ | ||
16 | file://run-ptest \ | 17 | file://run-ptest \ |
17 | " | 18 | " |
18 | 19 | ||