From e86c70a99f024c5d2973d25577ca2e657ce659db Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 25 Sep 2014 19:38:23 +0200 Subject: [PATCH] bash: Import fix for CVE-2014-7169 http://www.openwall.com/lists/oss-security/2014/09/25/10 --- lfs/bash | 1 + src/patches/bash-3.2-CVE-2014-7169.patch | 11 +++++++++++ 2 files changed, 12 insertions(+) create mode 100644 src/patches/bash-3.2-CVE-2014-7169.patch diff --git a/lfs/bash b/lfs/bash index 47a6c45954..58556faf04 100644 --- a/lfs/bash +++ b/lfs/bash @@ -97,6 +97,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/bash-4.0-profile-1.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/bash-3.2-ssh_source_bash.patch cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/bash-3.2-CVE-2014-6271.patch + cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/bash-3.2-CVE-2014-7169.patch cd $(DIR_APP) && ./configure $(EXTRA_CONFIG) cd $(DIR_APP) && make $(EXTRA_MAKE) diff --git a/src/patches/bash-3.2-CVE-2014-7169.patch b/src/patches/bash-3.2-CVE-2014-7169.patch new file mode 100644 index 0000000000..964b91f51e --- /dev/null +++ b/src/patches/bash-3.2-CVE-2014-7169.patch @@ -0,0 +1,11 @@ +*** ../bash-20140912/parse.y 2014-08-26 15:09:42.000000000 -0400 +--- parse.y 2014-09-24 22:47:28.000000000 -0400 +*************** +*** 2959,2962 **** +--- 2959,2964 ---- + word_desc_to_read = (WORD_DESC *)NULL; + ++ eol_ungetc_lookahead = 0; ++ + current_token = '\n'; /* XXX */ + last_read_token = '\n'; -- 2.39.2