From a2f7bb78767003033384a9f2030ac92cb7212d87 Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Tue, 20 Jun 2017 06:33:51 +0200
Subject: [PATCH] Resolves: #1462820

Auto-sync with upstream release/2.25/master

Upstream commit: adc7e06fb412a2a1ee52f8cb788caf436335b9f3

- CVE-2017-1000366: Avoid large allocas in the dynamic linker (#1462820)
- Ignore and remove LD_HWCAP_MASK for AT_SECURE programs (swbz#21209)
- Correct collation rules for Malayalam (swbz#19922, swbz#19919)
- fork: Remove bogus parent PID assertions (swbz#21386)
---
 glibc-fedora-__libc_multiple_libcs.patch | 35 +++++++++++++-----------
 glibc.spec                               | 12 ++++++--
 sources                                  |  2 +-
 3 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/glibc-fedora-__libc_multiple_libcs.patch b/glibc-fedora-__libc_multiple_libcs.patch
index 945a955..8d8e857 100644
--- a/glibc-fedora-__libc_multiple_libcs.patch
+++ b/glibc-fedora-__libc_multiple_libcs.patch
@@ -21,10 +21,11 @@
 #  elf/rtld.c       |    4 ----
 #  4 files changed, 7 insertions(+), 10 deletions(-)
 # 
-diff -urN glibc-2.20-205-ga39208b/elf/dl-init.c glibc-2.20-205-ga39208b.mod/elf/dl-init.c
---- glibc-2.20-205-ga39208b/elf/dl-init.c	2014-11-21 16:08:32.744913590 -0500
-+++ glibc-2.20-205-ga39208b.mod/elf/dl-init.c	2014-11-21 16:09:42.485708197 -0500
-@@ -119,8 +119,6 @@
+Index: b/elf/dl-init.c
+===================================================================
+--- a/elf/dl-init.c
++++ b/elf/dl-init.c
+@@ -119,8 +119,6 @@ _dl_init (struct link_map *main_map, int
    while (i-- > 0)
      call_init (main_map->l_initfini[i], argc, argv, env);
  
@@ -33,10 +34,11 @@ diff -urN glibc-2.20-205-ga39208b/elf/dl-init.c glibc-2.20-205-ga39208b.mod/elf/
    _dl_starting_up = 0;
 -#endif
  }
-diff -urN glibc-2.20-205-ga39208b/elf/dl-support.c glibc-2.20-205-ga39208b.mod/elf/dl-support.c
---- glibc-2.20-205-ga39208b/elf/dl-support.c	2014-11-19 14:35:03.000000000 -0500
-+++ glibc-2.20-205-ga39208b.mod/elf/dl-support.c	2014-11-21 16:09:54.829671843 -0500
-@@ -118,10 +118,8 @@
+Index: b/elf/dl-support.c
+===================================================================
+--- a/elf/dl-support.c
++++ b/elf/dl-support.c
+@@ -117,10 +117,8 @@ struct r_scope_elem _dl_initial_searchli
      .r_nlist = 1,
    };
  
@@ -47,18 +49,19 @@ diff -urN glibc-2.20-205-ga39208b/elf/dl-support.c glibc-2.20-205-ga39208b.mod/e
  
  /* Random data provided by the kernel.  */
  void *_dl_random;
-diff -urN glibc-2.20-205-ga39208b/elf/rtld.c glibc-2.20-205-ga39208b.mod/elf/rtld.c
---- glibc-2.20-205-ga39208b/elf/rtld.c	2014-11-21 16:08:32.745913587 -0500
-+++ glibc-2.20-205-ga39208b.mod/elf/rtld.c	2014-11-21 16:09:05.614816785 -0500
-@@ -107,7 +107,6 @@
-   struct audit_list *next;
- } *audit_list;
+Index: b/elf/rtld.c
+===================================================================
+--- a/elf/rtld.c
++++ b/elf/rtld.c
+@@ -214,7 +214,6 @@ audit_list_iter_next (struct audit_list_
+   return iter->previous->name;
+ }
  
 -#ifndef HAVE_INLINED_SYSCALLS
  /* Set nonzero during loading and initialization of executable and
     libraries, cleared before the executable's entry point runs.  This
     must not be initialized to nonzero, because the unused dynamic
-@@ -117,7 +116,6 @@
+@@ -224,7 +223,6 @@ audit_list_iter_next (struct audit_list_
     never be called.  */
  int _dl_starting_up = 0;
  rtld_hidden_def (_dl_starting_up)
@@ -66,7 +69,7 @@ diff -urN glibc-2.20-205-ga39208b/elf/rtld.c glibc-2.20-205-ga39208b.mod/elf/rtl
  
  /* This is the structure which defines all variables global to ld.so
     (except those which cannot be added for some reason).  */
-@@ -776,10 +774,8 @@
+@@ -898,10 +896,8 @@ dl_main (const ElfW(Phdr) *phdr,
    /* Process the environment variable which control the behaviour.  */
    process_envvars (&mode);
  
diff --git a/glibc.spec b/glibc.spec
index fb6f256..7b5dc91 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,6 +1,6 @@
-%define glibcsrcdir  glibc-2.25-16-g34b6f41
+%define glibcsrcdir  glibc-2.25-23-gadc7e06
 %define glibcversion 2.25
-%define glibcrelease 5%{?dist}
+%define glibcrelease 6%{?dist}
 # Pre-release tarballs are pulled in from git using a command that is
 # effectively:
 #
@@ -2270,6 +2270,14 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Tue Jun 20 2017 Florian Weimer <fweimer@redhat.com> - 2.25-6
+- Auto-sync with upstream release/2.25/master,
+  commit adc7e06fb412a2a1ee52f8cb788caf436335b9f3, fixing:
+- CVE-2017-1000366: Avoid large allocas in the dynamic linker (#1462820)
+- Ignore and remove LD_HWCAP_MASK for AT_SECURE programs (swbz#21209)
+- Correct collation rules for Malayalam (swbz#19922, swbz#19919)
+- fork: Remove bogus parent PID assertions (swbz#21386)
+
 * Mon Jun 05 2017 Arjun Shankar <arjun.is@lostca.se> - 2.25-5
 - Auto-sync with upstream release/2.25/master,
   commit 34b6f41c14d09fe627c6a6224880d76d0959079e, fixing:
diff --git a/sources b/sources
index 0ad4d22..3405ea6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (glibc-2.25-16-g34b6f41.tar.gz) = 453b7f8baf47b11a713aa8f9c55219dfbac4d34315dfdaf81bb0453ed114e2165a667b05c4d9af664faeeeb3510652e2e8d95fc7616b2b587ea084c960166c13
+SHA512 (glibc-2.25-23-gadc7e06.tar.gz) = b497138d26dd2f5d0ff225608d1ae1d9e72746827c1b9f695a809550b53e77927db0dd408b511291016fb855a99035de8e78bcc08bf62435f9a75cd7642c570d