diff options
| author | Florian Franzmann | 2014-09-25 23:47:44 +0200 |
|---|---|---|
| committer | Vlad Glagolev | 2015-01-30 10:26:13 +0300 |
| commit | 91b972285beedf77a6cea0cda0eb30c168cdb91c (patch) | |
| tree | 3cfa5b2fcffbd74a332f09da31d4e1f8d3f96c3c | |
| parent | a9e56f27a2aea1f759d91cdeb35d8384017a7068 (diff) | |
shell-term-fm/bash: fix CVE 2014 7169
(cherry picked from commit d075d0bdb85b6fd78517064bc911af64a2ef5f4e)
| -rw-r--r-- | shell-term-fm/bash/CVE-2014-7169.diff | 11 | ||||
| -rwxr-xr-x | shell-term-fm/bash/DETAILS | 2 | ||||
| -rw-r--r-- | shell-term-fm/bash/HISTORY | 4 | ||||
| -rwxr-xr-x | shell-term-fm/bash/PRE_BUILD | 2 |
4 files changed, 18 insertions, 1 deletions
diff --git a/shell-term-fm/bash/CVE-2014-7169.diff b/shell-term-fm/bash/CVE-2014-7169.diff new file mode 100644 index 0000000000..356184bdcd --- /dev/null +++ b/shell-term-fm/bash/CVE-2014-7169.diff @@ -0,0 +1,11 @@ +--- a/bash/parse.y ++++ b/bash/parse.y +@@ -2848,6 +2848,8 @@ reset_parser () + FREE (word_desc_to_read); + word_desc_to_read = (WORD_DESC *)NULL; + ++ eol_ungetc_lookahead = 0; ++ + current_token = '\n'; /* XXX */ + last_read_token = '\n'; + token_to_read = '\n'; diff --git a/shell-term-fm/bash/DETAILS b/shell-term-fm/bash/DETAILS index f21474eaa8..ee8855857a 100755 --- a/shell-term-fm/bash/DETAILS +++ b/shell-term-fm/bash/DETAILS @@ -1,6 +1,6 @@ SPELL=bash VERSION=4.3 - SECURITY_PATCH=3 + SECURITY_PATCH=4 BASH_PATCHLEVEL=025 SOURCE=$SPELL-$VERSION.tar.gz SOURCE2=$SOURCE.sig diff --git a/shell-term-fm/bash/HISTORY b/shell-term-fm/bash/HISTORY index c1b3acb9c1..1bb70d8b89 100644 --- a/shell-term-fm/bash/HISTORY +++ b/shell-term-fm/bash/HISTORY @@ -1,3 +1,7 @@ +2014-09-25 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> + * DETAILS: SECURITY_PATCH++ + * PRE_BUILD, CVE-2014-7169.diff: fix CVE 2014 7169 + 2014-09-24 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> * DETAILS, PRE_BUILD: version 4.3 patchlevel 25 * patches/bash-42-*: removed diff --git a/shell-term-fm/bash/PRE_BUILD b/shell-term-fm/bash/PRE_BUILD index d3aa1ef942..a0f2d5ffb4 100755 --- a/shell-term-fm/bash/PRE_BUILD +++ b/shell-term-fm/bash/PRE_BUILD @@ -7,6 +7,8 @@ for i in $(seq -w 1 $BASH_PATCHLEVEL); do patch -p0 < $SPELL_DIRECTORY/patches/bash43-$i done && +patch -p2 < $SPELL_DIRECTORY/CVE-2014-7169.diff && + if [[ "$BASH_NI_LOGIN" == y ]]; then message "${MESSAGE_COLOR}Defining NON_INTERACTIVE_LOGIN_SHELLS.$DEFAULT_COLOR" && sed -i 's/\/\* \(#define NON_INTERACTIVE_LOGIN_SHELLS\) \*\//\1/' config-top.h |