glibc: 2.24-6

2017-06-20 15:29:48 +02:00 · 2017-06-20 15:29:48 +02:00 · f7f26b8373
commit f7f26b8373
parent 62eb2fedd5
4 changed files with 62 additions and 13 deletions
--- a/glibc/.md5sum
+++ b/glibc/.md5sum
@ -1,5 +1,5 @@
 aaad345ff18993dafe3e44ac947f7157  glibc-2.20-multilib-dirs.patch
-3d8966b34b0c2558190e7ea7917feaa6  glibc-2.24-updates.patch
+655f50d41e24dcd37447fd6c63ce3f7f  glibc-2.24-updates.patch
 97dc5517f92016f3d70d83e3162ad318  glibc-2.24.tar.xz
 96156bec8e05de67384dc93e72bdc313  host.conf
 fbbc215a9b15ba4846f326cc88108057  hosts
--- a/glibc/.signature
+++ b/glibc/.signature
@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/core.pub
-RWRJc1FUaeVeqj3Srk8gIuIBg7pND80HEkXIwyRHMgvKYbyoQpATc0l0ZWAOkEuMiBDWOJRiEereoI3WFwNkSpQBXVCH9qnQ8wM=
-SHA256 (Pkgfile) = defc7924ce1c7649d42facecda7c772d774dd4baf521ea172819e4cfda48e38c
+RWRJc1FUaeVeqtVJlLAe7fOw0aoY6VbVJ3a+OMe5w4BXxwC61vgHxotrmJkZTRVXMHlKgv0Y1NNWgW+jzI3oKP6NrQcCPCf/QQQ=
+SHA256 (Pkgfile) = 116fd143fdc2ac6e0ccfe5fbbcbc5a206c9ac8abf962ca4b5ddf3fafdcfd60b6
 SHA256 (.footprint) = 9bfd444359441e61174162207102b96597aa3a7051b4c5d8401d9d0e2713ec81
 SHA256 (glibc-2.24.tar.xz) = 99d4a3e8efd144d71488e478f62587578c0f4e1fa0b4eed47ee3d4975ebeb5d3
 SHA256 (kernel-headers-4.9.5.tar.xz) = 5783ad8f668ee71561fae370fbcdc477aaa6df249bd85635b87a8c204aeb4aa9
@ -10,4 +10,4 @@ SHA256 (resolv.conf) = 72ccb58768a72a771ec37142bc361a18478a07ec9de6e925a20760794
 SHA256 (nsswitch.conf) = 859b8984e5e90aff3cce8f9779996ae4033b280d2122840e9411e2f44a1c2e61
 SHA256 (host.conf) = 1bffc6575eb6204458758c34656cd44d87e7d89f545055f8857dd8906b7fb277
 SHA256 (ld.so.conf) = 441a37924864b5b063208922ea04a926cd9654e74ed3f160b9d455b56d23387f
-SHA256 (glibc-2.24-updates.patch) = 37a4640014133767fe2d66bd0ef3f70d1d688556a6ca6ace50e4ab5d0ad728c1
+SHA256 (glibc-2.24-updates.patch) = d74245b3a34b4bcd119ac1da145ee01af77f98c0d3c4bee763049582e8582971
--- a/glibc/Pkgfile
+++ b/glibc/Pkgfile
@ -4,7 +4,7 @@

 name=glibc
 version=2.24
-release=5
+release=6
 source=(http://ftpmirror.gnu.org/gnu/glibc/glibc-2.24.tar.xz \
 	http://crux.nu/files/distfiles/kernel-headers-4.9.5.tar.xz \
 	$name-2.20-multilib-dirs.patch \
--- a/glibc/glibc-2.24-updates.patch
+++ b/glibc/glibc-2.24-updates.patch
@ -1,8 +1,20 @@
 diff --git a/ChangeLog b/ChangeLog
-index c44c926094..7b8c817b68 100644
+index c44c926094..cd6b5a92e9 100644
 --- a/ChangeLog
 +++ b/ChangeLog
-@@ -1,3 +1,553 @@
+@@ -1,3 +1,565 @@
+2017-06-14  Florian Weimer  <fweimer@redhat.com>
+
+	* sysdeps/i386/i686/multiarch/strcspn-c.c: Add IS_IN (libc) guard.
+	* sysdeps/i386/i686/multiarch/varshift.c: Likewise.
+
+2017-03-07  Siddhesh Poyarekar  <siddhesh@sourceware.org>
+
+	[BZ #21209]
+	* elf/rtld.c (process_envvars): Ignore LD_HWCAP_MASK for
+	AT_SECURE processes.
+	* sysdeps/generic/unsecvars.h: Add LD_HWCAP_MASK.
+
 +2017-06-19  Florian Weimer  <fweimer@redhat.com>
 +
 +	* elf/rtld.c (audit_list_string): New variable.
@ -611,10 +623,10 @@ index 03fd89c13e..ee379f5852 100644
 
 ifndef avoid-generated
 diff --git a/NEWS b/NEWS
-index b0447e7169..d42af91972 100644
+index b0447e7169..c4c082b415 100644
 --- a/NEWS
 +++ b/NEWS
-@@ -5,6 +5,28 @@ See the end for copying conditions.
+@@ -5,6 +5,29 @@ See the end for copying conditions.
 Please send GNU C library bug reports via <http://sourceware.org/bugzilla/>
 using `glibc' in the "product" field.
 
@ -636,6 +648,7 @@ index b0447e7169..d42af91972 100644
 +
 +The following bugs are resolved with this release:
 +
+  [21209] Ignore and remove LD_HWCAP_MASK for AT_SECURE programs
 +  [21289] Fix symbol redirect for fts_set
 +  [21386] Assertion in fork for distinct parent PID is incorrect
 +  [21624] Unsafe alloca allows local attackers to alias stack and heap (CVE-2017-1000366)
@ -921,7 +934,7 @@ index 687d7de874..9f93ab7628 100644
   _dl_close_worker (map, false);
 
 diff --git a/elf/rtld.c b/elf/rtld.c
-index 647661ca45..302bb63620 100644
+index 647661ca45..8f56d6edd3 100644
 --- a/elf/rtld.c
 +++ b/elf/rtld.c
@@ -99,14 +99,121 @@ uintptr_t __pointer_chk_guard_local
@ -1206,7 +1219,17 @@ index 647661ca45..302bb63620 100644
 	  break;
 
 	case 7:
-@@ -2437,7 +2567,8 @@ process_envvars (enum mode *modep)
+@@ -2423,7 +2553,8 @@ process_envvars (enum mode *modep)
+ 
+ 	case 10:
+ 	  /* Mask for the important hardware capabilities.  */
+-	  if (memcmp (envline, "HWCAP_MASK", 10) == 0)
+	  if (!__libc_enable_secure
+	      && memcmp (envline, "HWCAP_MASK", 10) == 0)
+ 	    GLRO(dl_hwcap_mask) = __strtoul_internal (&envline[11], NULL,
+ 						      0, 0);
+ 	  break;
+@@ -2437,7 +2568,8 @@ process_envvars (enum mode *modep)
 
 	case 12:
 	  /* The library search path.  */
@ -11573,10 +11596,10 @@ index 92cc441d3d..bf9c0a1c17 100644
 -PID_OFFSET			thread_offsetof (pid)
 TID_OFFSET			thread_offsetof (tid)
 diff --git a/sysdeps/generic/unsecvars.h b/sysdeps/generic/unsecvars.h
-index d5b8119c9c..3e56538b51 100644
+index d5b8119c9c..ac57bd5db0 100644
 --- a/sysdeps/generic/unsecvars.h
 +++ b/sysdeps/generic/unsecvars.h
-@@ -4,6 +4,7 @@
+@@ -4,11 +4,13 @@
 #define UNSECURE_ENVVARS \
   "GCONV_PATH\0"							      \
   "GETCONF_DIR\0"							      \
@ -11584,6 +11607,12 @@ index d5b8119c9c..3e56538b51 100644
   "HOSTALIASES\0"							      \
   "LD_AUDIT\0"								      \
   "LD_DEBUG\0"								      \
+   "LD_DEBUG_OUTPUT\0"							      \
+   "LD_DYNAMIC_WEAK\0"							      \
+  "LD_HWCAP_MASK\0"							      \
+   "LD_LIBRARY_PATH\0"							      \
+   "LD_ORIGIN_PATH\0"							      \
+   "LD_PRELOAD\0"							      \
 diff --git a/sysdeps/hppa/dl-machine.h b/sysdeps/hppa/dl-machine.h
 index 9404211819..01bd5bf197 100644
 --- a/sysdeps/hppa/dl-machine.h
@ -11630,6 +11659,26 @@ index c2f326ee3d..6e852f35b1 100644
 -PID_THREAD_OFFSET		thread_offsetof (pid)
 TID_THREAD_OFFSET		thread_offsetof (tid)
 MULTIPLE_THREADS_THREAD_OFFSET	thread_offsetof (header.multiple_threads)
+diff --git a/sysdeps/i386/i686/multiarch/strcspn-c.c b/sysdeps/i386/i686/multiarch/strcspn-c.c
+index 6d61e190a8..ec230fb383 100644
+--- a/sysdeps/i386/i686/multiarch/strcspn-c.c
+++ b/sysdeps/i386/i686/multiarch/strcspn-c.c
+@@ -1,2 +1,4 @@
+-#define __strcspn_sse2 __strcspn_ia32
+-#include <sysdeps/x86_64/multiarch/strcspn-c.c>
+#if IS_IN (libc)
+# define __strcspn_sse2 __strcspn_ia32
+# include <sysdeps/x86_64/multiarch/strcspn-c.c>
+#endif
+diff --git a/sysdeps/i386/i686/multiarch/varshift.c b/sysdeps/i386/i686/multiarch/varshift.c
+index 7760b966e2..6742a35d41 100644
+--- a/sysdeps/i386/i686/multiarch/varshift.c
+++ b/sysdeps/i386/i686/multiarch/varshift.c
+@@ -1 +1,3 @@
+-#include <sysdeps/x86_64/multiarch/varshift.c>
+#if IS_IN (libc)
+# include <sysdeps/x86_64/multiarch/varshift.c>
+#endif
 diff --git a/sysdeps/i386/nptl/tcb-offsets.sym b/sysdeps/i386/nptl/tcb-offsets.sym
 index 7bdf161b29..695a810386 100644
 --- a/sysdeps/i386/nptl/tcb-offsets.sym