From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 17 Aug 2015 19:49:34 +0000 (+0100)
Subject: glibc: Import security fixes from upstream
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9eb008dc92c4d679441ef736aa89ed1b21e0a372;p=people%2Fms%2Fipfire-2.x.git

glibc: Import security fixes from upstream

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/rootfiles/core/94/filelists/armv5tel/glibc b/config/rootfiles/core/94/filelists/armv5tel/glibc
new file mode 120000
index 0000000000..4c70d724b4
--- /dev/null
+++ b/config/rootfiles/core/94/filelists/armv5tel/glibc
@@ -0,0 +1 @@
+../../../../common/armv5tel/glibc
\ No newline at end of file
diff --git a/config/rootfiles/core/94/filelists/i586/glibc b/config/rootfiles/core/94/filelists/i586/glibc
new file mode 120000
index 0000000000..943021f19a
--- /dev/null
+++ b/config/rootfiles/core/94/filelists/i586/glibc
@@ -0,0 +1 @@
+../../../../common/i586/glibc
\ No newline at end of file
diff --git a/lfs/glibc b/lfs/glibc
index 4ec71a788e..6675065d4c 100644
--- a/lfs/glibc
+++ b/lfs/glibc
@@ -285,6 +285,7 @@ endif
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh1183533.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh1207995.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh1209375.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh1217186.patch
 
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-resolv-stack_chk_fail.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-remove-ctors-dtors-output-sections.patch
diff --git a/src/patches/glibc/glibc-rh1217186.patch b/src/patches/glibc/glibc-rh1217186.patch
new file mode 100644
index 0000000000..6c6c3934ef
--- /dev/null
+++ b/src/patches/glibc/glibc-rh1217186.patch
@@ -0,0 +1,65 @@
+#
+# Author: Carlos O'Donell
+# Upstream status: Needs to go upstream (2015-05-07)
+#
+diff --git a/inet/rcmd.c b/inet/rcmd.c
+index acacaa0..9f2443b 100644
+--- a/inet/rcmd.c
++++ b/inet/rcmd.c
+@@ -803,29 +803,38 @@ __validuser2_sa(hostf, ra, ralen, luser, ruser, rhost)
+ 	*p = '\0';              /* <nul> terminate username (+host?) */
+ 
+ 	/* buf -> host(?) ; user -> username(?) */
++	if (*buf == '\0')
++	  break;
++	if (*user == '\0')
++	  user = luser;
++
++	/* First check the user part.  This is an optimization, since
++	   one should always check the host first in order to detect
++	   negative host checks (which we check for later).  */
++	ucheck = __icheckuser (user, ruser);
++
++	/* Either we found the user, or we didn't and this is a
++	   negative host check.  We must do the negative host lookup
++	   in order to preserve the semantics of stopping on this line
++	   before processing others.  */
++	if (ucheck != 0 || *buf == '-') {
++
++	    /* Next check host part */
++	    hcheck = __checkhost_sa (ra, ralen, buf, rhost);
++
++	    /* Negative '-host user(?)' match?  */
++	    if (hcheck < 0)
++		break;
+ 
+-	/* First check host part */
+-	hcheck = __checkhost_sa (ra, ralen, buf, rhost);
+-
+-	if (hcheck < 0)
+-	    break;
+-
+-	if (hcheck) {
+-	    /* Then check user part */
+-	    if (! (*user))
+-		user = luser;
+-
+-	    ucheck = __icheckuser (user, ruser);
+-
+-	    /* Positive 'host user' match? */
+-	    if (ucheck > 0) {
++	    /* Positive 'host user' match?  */
++	    if (hcheck > 0 && ucheck > 0) {
+ 		retval = 0;
+ 		break;
+ 	    }
+ 
+-	    /* Negative 'host -user' match? */
+-	    if (ucheck < 0)
+-		break;
++	    /* Negative 'host -user' match?  */
++	    if (hcheck > 0 && ucheck < 0)
++	      break;
+ 
+ 	    /* Neither, go on looking for match */
+ 	}