From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 25 Sep 2014 17:38:23 +0000 (+0200)
Subject: bash: Import fix for CVE-2014-7169
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6dc126e03fb19109264103bd61fff38bf1487147;p=people%2Fms%2Fipfire-2.x.git

bash: Import fix for CVE-2014-7169

http://www.openwall.com/lists/oss-security/2014/09/25/10

Conflicts:
	lfs/bash
---

diff --git a/lfs/bash b/lfs/bash
index e09f91ceb5..ee1946ec01 100644
--- a/lfs/bash
+++ b/lfs/bash
@@ -95,6 +95,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-4.3-CVE-2014-6271.patch
+	cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/bash-3.2-CVE-2014-7169.patch
 
 	cd $(DIR_APP) && ./configure $(CONFIGURE_OPTIONS)
 	cd $(DIR_APP) && make $(MAKETUNING)
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';