rpms/glibc
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Resolves: #1462820

Browse Source 
Auto-sync with upstream release/2.24/master

Upstream commit: 0578ef88fd6ea9bd0039ab8cbcbc9a964e3b9969

- 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)
This commit is contained in:
Florian Weimer 2017-06-20 06:17:46 +02:00
parent e73e19f80f
commit 52f40f6b72
3 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
glibc-fedora-__libc_multiple_libcs.patch
View File

@ -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);

12
glibc.spec
View File

@ -1,6 +1,6 @@
%define glibcsrcdir glibc-2.24-51-g7b60553
%define glibcsrcdir glibc-2.24-58-g0578ef8
%define glibcversion 2.24
%define glibcrelease 6%{?dist}
%define glibcrelease 7%{?dist}
# Pre-release tarballs are pulled in from git using a command that is
# effectively:
#
@ -2266,6 +2266,14 @@ rm -f *.filelist*
%endif
%changelog
* Tue Jun 20 2017 Florian Weimer <fweimer@redhat.com> - 2.24-7
- Auto-sync with upstream release/2.24/master,
commit 0578ef88fd6ea9bd0039ab8cbcbc9a964e3b9969, 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)
* Wed Jun 07 2017 Arjun Shankar <arjun.is@lostca.se> - 2.24-6
- Auto-sync with upstream release/2.24/master,
commit 7b60553e360731338631ccdda71590ac5deca137, fixing:

2
sources
View File

@ -1 +1 @@
SHA512 (glibc-2.24-51-g7b60553.tar.gz) = e967f875f4c7c8e69ef2f0f6a2de68f8d979f09da25da68349f7cb49e2f06dabbea36cd99c51df3990b1af85eee916ad590460d19753c84d8d25603e061f9e30
SHA512 (glibc-2.24-58-g0578ef8.tar.gz) = 91c4d14a9d755e5532f79974d8e8191279144af4cc9e47584136dcab1773193ffb1c571bd78e692727ee40fab37e6ec4415bbe070ae3b355e2da376c6cfe1616