-commit 6e502e19455c6110dd4487d91b7b7d6d8121f9ba
-Author: Ulrich Drepper <drepper@gmail.com>
-Date: Wed Jun 22 08:32:55 2011 -0400
+commit 58b930ae216bfa98cd60212b954b07b9963d6d04
+Author: Siddhesh Poyarekar <siddhesh@redhat.com>
+Date: Wed Sep 10 21:51:50 2014 +0530
- Clean up after kernel sigcontext header mess
+ Return failure in getnetgrent only when all netgroups have been searched (#17363)
+
+ The netgroups lookup code fails when one of the groups in the search
+ tree is empty. In such a case it only returns the leaves of the tree
+ after the blank netgroup. This is because the line parser returns a
+ NOTFOUND status when the netgroup exists but is empty. The
+ __getnetgrent_internal implementation needs to be fixed to try
+ remaining groups if the current group is entry. This patch implements
+ this fix. Tested on x86_64.
+
+ [BZ #17363]
+ * inet/getnetgrent_r.c (__internal_getnetgrent_r): Try next
+ group if the current group is empty.
-diff --git a/sysdeps/unix/sysv/linux/bits/sigcontext.h b/sysdeps/unix/sysv/linux/bits/sigcontext.h
-index 67dcf94..0f5b607 100644
---- a/sysdeps/unix/sysv/linux/bits/sigcontext.h
-+++ b/sysdeps/unix/sysv/linux/bits/sigcontext.h
-@@ -1,4 +1,4 @@
--/* Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
-+/* Copyright (C) 1996, 1997, 1998, 2011 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
-@@ -26,4 +26,8 @@
- # define sigcontext_struct sigcontext
+diff --git a/inet/getnetgrent_r.c b/inet/getnetgrent_r.c
+index f6d064d..e101537 100644
+--- a/inet/getnetgrent_r.c
++++ b/inet/getnetgrent_r.c
+@@ -297,7 +297,10 @@ __internal_getnetgrent_r (char **hostp, char **userp, char **domainp,
+ {
+ status = DL_CALL_FCT (*fct, (datap, buffer, buflen, &errno));
- # include <asm/sigcontext.h>
-+
-+/* The Linux kernel headers redefine NULL wrongly, so cleanup afterwards. */
-+# define __need_NULL
-+# include <stddef.h>
- #endif
-commit 852eb34d5c56bc75bdd82327fcf310d98655f6b0
-Author: Ulrich Drepper <drepper@gmail.com>
-Date: Wed Jun 22 09:50:39 2011 -0400
+- if (status == NSS_STATUS_RETURN)
++ if (status == NSS_STATUS_RETURN
++ /* The service returned a NOTFOUND, but there are more groups that we
++ need to resolve before we give up. */
++ || (status == NSS_STATUS_NOTFOUND && datap->needed_groups != NULL))
+ {
+ /* This was the last one for this group. Look at next group
+ if available. */
+commit 984c0ea97f649c869130a1ff099098e2b6f70aad
+Author: Tim Lammens <tim.lammens@gmail.com>
+Date: Thu Sep 11 10:35:54 2014 +0530
- Rate limit expensive _SC_NPROCESSORS_ONLN computation
+ Fix memory leak in libio/wfileops.c do_ftell_wide [BZ #17370]
-diff --git a/sysdeps/unix/sysv/linux/getsysstats.c b/sysdeps/unix/sysv/linux/getsysstats.c
-index af454b6..a13b6e3 100644
---- a/sysdeps/unix/sysv/linux/getsysstats.c
-+++ b/sysdeps/unix/sysv/linux/getsysstats.c
-@@ -1,5 +1,5 @@
- /* Determine various system internal values, Linux version.
-- Copyright (C) 1996-2003,2006,2007,2009,2010 Free Software Foundation, Inc.
-+ Copyright (C) 1996-2003,2006,2007,2009,2010,2011 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
+diff --git a/libio/wfileops.c b/libio/wfileops.c
+index f123add..ebc06e8 100644
+--- a/libio/wfileops.c
++++ b/libio/wfileops.c
+@@ -711,6 +711,7 @@ do_ftell_wide (_IO_FILE *fp)
+ return WEOF;
-@@ -35,6 +35,16 @@
-
- #include <atomic.h>
- #include <not-cancel.h>
-+#include <kernel-features.h>
-+
-+#ifndef HAVE_CLOCK_GETTIME_VSYSCALL
-+# undef INTERNAL_VSYSCALL
-+# define INTERNAL_VSYSCALL INTERNAL_SYSCALL
-+# undef INLINE_VSYSCALL
-+# define INLINE_VSYSCALL INLINE_SYSCALL
-+#else
-+# include <bits/libc-vdso.h>
-+#endif
+ offset += outstop - out;
++ free (out);
+ }
+ /* We don't trust _IO_read_end to represent the current file offset
+commit 52ffbdf25a1100986f4ae27bb0febbe5a722ab25
+Author: Florian Weimer <fweimer@redhat.com>
+Date: Wed Sep 10 20:29:15 2014 +0200
+
+ malloc: additional unlink hardening for non-small bins [BZ #17344]
+
+ Turn two asserts into a conditional call to malloc_printerr. The
+ memory locations are accessed later anyway, so the performance
+ impact is minor.
+
+diff --git a/malloc/malloc.c b/malloc/malloc.c
+index 6ee3840..6cbe9f3 100644
+--- a/malloc/malloc.c
++++ b/malloc/malloc.c
+@@ -1418,8 +1418,10 @@ typedef struct malloc_chunk *mbinptr;
+ BK->fd = FD; \
+ if (!in_smallbin_range (P->size) \
+ && __builtin_expect (P->fd_nextsize != NULL, 0)) { \
+- assert (P->fd_nextsize->bk_nextsize == P); \
+- assert (P->bk_nextsize->fd_nextsize == P); \
++ if (__builtin_expect (P->fd_nextsize->bk_nextsize != P, 0) \
++ || __builtin_expect (P->bk_nextsize->fd_nextsize != P, 0)) \
++ malloc_printerr (check_action, \
++ "corrupted double-linked list (not small)", P);\
+ if (FD->fd_nextsize == NULL) { \
+ if (P->fd_nextsize == P) \
+ FD->fd_nextsize = FD->bk_nextsize = FD; \
+commit a7b872687073decdcc7effc2289877d69058aca9
+Author: Andreas Schwab <schwab@linux-m68k.org>
+Date: Sat Sep 13 10:10:29 2014 +0200
+
+ Handle zero prefix length in getifaddrs (BZ #17371)
+
+diff --git a/sysdeps/unix/sysv/linux/ifaddrs.c b/sysdeps/unix/sysv/linux/ifaddrs.c
+index 2c04e17..a47b2ed 100644
+--- a/sysdeps/unix/sysv/linux/ifaddrs.c
++++ b/sysdeps/unix/sysv/linux/ifaddrs.c
+@@ -770,20 +770,17 @@ getifaddrs_internal (struct ifaddrs **ifap)
- /* How we can determine the number of available processors depends on
-@@ -128,6 +138,22 @@ next_line (int fd, char *const buffer, char **cp, char **re,
- int
- __get_nprocs ()
- {
-+ static int cached_result;
-+ static time_t timestamp;
-+
-+#ifdef __ASSUME_POSIX_TIMERS
-+ struct timespec ts;
-+ INTERNAL_SYSCALL_DECL (err);
-+ INTERNAL_VSYSCALL (clock_gettime, err, 2, CLOCK_REALTIME, &ts);
-+#else
-+ struct timeval ts;
-+ gettimeofday (&ts, NULL);
-+#endif
-+ time_t prev = timestamp;
-+ atomic_read_barrier ();
-+ if (ts.tv_sec == prev)
-+ return cached_result;
-+
- /* XXX Here will come a test for the new system call. */
+ if (cp != NULL)
+ {
+- char c;
+ unsigned int preflen;
- const size_t buffer_size = __libc_use_alloca (8192) ? 8192 : 512;
-@@ -169,6 +195,10 @@ __get_nprocs ()
- }
- }
+- if ((max_prefixlen > 0) &&
+- (ifam->ifa_prefixlen > max_prefixlen))
++ if (ifam->ifa_prefixlen > max_prefixlen)
+ preflen = max_prefixlen;
+ else
+ preflen = ifam->ifa_prefixlen;
-+ cached_result = result;
-+ atomic_write_barrier ();
-+ timestamp = ts.tv_sec;
-+
- return result;
- }
- weak_alias (__get_nprocs, get_nprocs)
-commit 84e2a551a72c79b020694bb327e33b6d71b09b63
-Author: Ulrich Drepper <drepper@gmail.com>
-Date: Wed Jun 22 10:32:07 2011 -0400
+- for (i = 0; i < ((preflen - 1) / 8); i++)
++ for (i = 0; i < preflen / 8; i++)
+ *cp++ = 0xff;
+- c = 0xff;
+- c <<= ((128 - preflen) % 8);
+- *cp = c;
++ if (preflen % 8)
++ *cp = 0xff << (8 - preflen % 8);
+ }
+ }
+ }
+commit 545583d664b64ff234b99aca0d85e99c8a55808f
+Author: Siddhesh Poyarekar <siddhesh@redhat.com>
+Date: Tue Sep 16 14:20:45 2014 +0530
- Use a /sys/devices/system/cpu/online for _SC_NPROCESSORS_ONLN implementation
+ Fix memory leak in error path of do_ftell_wide (BZ #17370)
-diff --git a/sysdeps/unix/sysv/linux/getsysstats.c b/sysdeps/unix/sysv/linux/getsysstats.c
-index a13b6e3..b74774f 100644
---- a/sysdeps/unix/sysv/linux/getsysstats.c
-+++ b/sysdeps/unix/sysv/linux/getsysstats.c
-@@ -161,20 +161,65 @@ __get_nprocs ()
- char *buffer_end = buffer + buffer_size;
- char *cp = buffer_end;
- char *re = buffer_end;
-- int result = 1;
+diff --git a/libio/wfileops.c b/libio/wfileops.c
+index ebc06e8..c5ec5f7 100644
+--- a/libio/wfileops.c
++++ b/libio/wfileops.c
+@@ -708,7 +708,10 @@ do_ftell_wide (_IO_FILE *fp)
+ sequences must be complete since they are accepted as
+ wchar_t; if not, then that is an error. */
+ if (__glibc_unlikely (status != __codecvt_ok))
+- return WEOF;
++ {
++ free (out);
++ return WEOF;
++ }
- #ifdef O_CLOEXEC
- const int flags = O_RDONLY | O_CLOEXEC;
- #else
- const int flags = O_RDONLY;
- #endif
-+ int fd = open_not_cancel_2 ("/sys/devices/system/cpu/online", flags);
-+ char *l;
-+ int result = 0;
-+ if (fd != -1)
-+ {
-+ l = next_line (fd, buffer, &cp, &re, buffer_end);
-+ if (l != NULL)
-+ do
-+ {
-+ char *endp;
-+ unsigned long int n = strtoul (l, &endp, 10);
-+ if (l == endp)
-+ {
-+ result = 0;
-+ break;
-+ }
+ offset += outstop - out;
+ free (out);
+commit 04b76b5aa8b2d1d19066e42dd1a56a38f34e274c
+Author: Andreas Schwab <schwab@suse.de>
+Date: Thu Oct 30 12:18:48 2014 +0100
+
+ Don't error out writing a multibyte character to an unbuffered stream (bug 17522)
+
+diff --git a/libio/Makefile b/libio/Makefile
+index 56952ce..2742128 100644
+--- a/libio/Makefile
++++ b/libio/Makefile
+@@ -61,7 +61,7 @@ tests = tst_swprintf tst_wprintf tst_swscanf tst_wscanf tst_getwc tst_putwc \
+ bug-memstream1 bug-wmemstream1 \
+ tst-setvbuf1 tst-popen1 tst-fgetwc bug-wsetpos tst-fseek \
+ tst-fwrite-error tst-ftell-partial-wide tst-ftell-active-handler \
+- tst-ftell-append
++ tst-ftell-append tst-fputws
+ ifeq (yes,$(build-shared))
+ # Add test-fopenloc only if shared library is enabled since it depends on
+ # shared localedata objects.
+diff --git a/libio/tst-fputws.c b/libio/tst-fputws.c
+new file mode 100644
+index 0000000..09f53df
+--- /dev/null
++++ b/libio/tst-fputws.c
+@@ -0,0 +1,39 @@
++/* Test that we can write a multibyte character to an unbuffered stream.
++ Copyright (C) 2014 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
+
-+ unsigned long int m = n;
-+ if (*endp == '-')
-+ {
-+ l = endp + 1;
-+ m = strtoul (l, &endp, 10);
-+ if (l == endp)
-+ {
-+ result = 0;
-+ break;
-+ }
-+ }
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
+
-+ result += m - n + 1;
++ The GNU C Library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Lesser General Public License for more details.
+
-+ l = endp;
-+ while (l < re && isspace (*l))
-+ ++l;
-+ }
-+ while (l < re);
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, see
++ <http://www.gnu.org/licenses/>. */
+
-+ close_not_cancel_no_status (fd);
++#include <locale.h>
++#include <stdio.h>
++#include <wchar.h>
+
-+ if (result > 0)
-+ goto out;
-+ }
++static int
++do_test (void)
++{
++ const wchar_t str[] = L"\xbe\n";
+
-+ cp = buffer_end;
-+ re = buffer_end;
-+ result = 1;
++ setlocale (LC_ALL, "en_US.UTF-8");
++ setvbuf (stdout, NULL, _IONBF, 0);
+
- /* The /proc/stat format is more uniform, use it by default. */
-- int fd = open_not_cancel_2 ("/proc/stat", flags);
-+ fd = open_not_cancel_2 ("/proc/stat", flags);
- if (fd != -1)
- {
- result = 0;
-
-- char *l;
- while ((l = next_line (fd, buffer, &cp, &re, buffer_end)) != NULL)
- /* The current format of /proc/stat has all the cpu* entries
- at the front. We assume here that stays this way. */
-@@ -195,6 +240,7 @@ __get_nprocs ()
- }
- }
-
-+ out:
- cached_result = result;
- atomic_write_barrier ();
- timestamp = ts.tv_sec;
-commit 2d4fa81e11abc464b5b1f6417525285e84ff787c
-Author: Roland McGrath <roland@hack.frob.com>
-Date: Sat Jun 11 03:41:23 2011 -0700
-
- Consolidate shlib.lds references in new variables.
-
-diff --git a/Makerules b/Makerules
-index 6b4b0e1..d3cb4cc 100644
---- a/Makerules
-+++ b/Makerules
-@@ -514,8 +514,11 @@ $(common-objpfx)shlib.lds: $(common-objpfx)config.make $(..)Makerules
- mv -f $@T $@
- common-generated += shlib.lds
-
-+shlib-lds = $(common-objpfx)shlib.lds
-+shlib-lds-flags = -T $(shlib-lds)
++ if (fputws (str, stdout) < 0)
++ return 1;
+
- define build-shlib
--$(build-shlib-helper) -o $@ -T $(common-objpfx)shlib.lds \
-+$(build-shlib-helper) -o $@ $(shlib-lds-flags) \
- $(csu-objpfx)abi-note.o $(build-shlib-objlist)
- endef
- else
-@@ -557,11 +560,11 @@ ifeq (yes,$(elf))
- # binutils only position loadable notes into the first page for binaries,
- # not for shared objects
- define build-module
--$(build-module-helper) -o $@ -T $(common-objpfx)shlib.lds \
-+$(build-module-helper) -o $@ $(shlib-lds-flags) \
- $(csu-objpfx)abi-note.o $(build-module-objlist)
- endef
- define build-module-asneeded
--$(build-module-helper) -o $@ -T $(common-objpfx)shlib.lds \
-+$(build-module-helper) -o $@ $(shlib-lds-flags) \
- $(csu-objpfx)abi-note.o \
- -Wl,--as-needed $(build-module-objlist) -Wl,--no-as-needed
- endef
-@@ -618,7 +621,7 @@ $(common-objpfx)libc.so: $(elfobjdir)/soinit.os \
- $(common-objpfx)libc_pic.os \
- $(elfobjdir)/sofini.os \
- $(elfobjdir)/interp.os $(elfobjdir)/ld.so \
-- $(common-objpfx)shlib.lds
-+ $(shlib-lds)
- $(build-shlib)
- ifeq ($(versioning),yes)
- $(common-objpfx)libc.so: $(common-objpfx)libc.map
-@@ -689,7 +692,7 @@ include $(patsubst %,$(..)extra-modules.mk,$(modules-names))
++ return 0;
++}
++
++#define TEST_FUNCTION do_test ()
++
++#include <test-skeleton.c>
+diff --git a/libio/wfileops.c b/libio/wfileops.c
+index c5ec5f7..6a088b1 100644
+--- a/libio/wfileops.c
++++ b/libio/wfileops.c
+@@ -75,17 +75,32 @@ _IO_wdo_write (fp, data, to_do)
+ {
+ enum __codecvt_result result;
+ const wchar_t *new_data;
++ char mb_buf[MB_LEN_MAX];
++ char *write_base, *write_ptr, *buf_end;
++
++ if (fp->_IO_write_ptr - fp->_IO_write_base < sizeof (mb_buf))
++ {
++ /* Make sure we have room for at least one multibyte
++ character. */
++ write_ptr = write_base = mb_buf;
++ buf_end = mb_buf + sizeof (mb_buf);
++ }
++ else
++ {
++ write_ptr = fp->_IO_write_ptr;
++ write_base = fp->_IO_write_base;
++ buf_end = fp->_IO_buf_end;
++ }
- extra-modules-build := $(filter-out $(modules-names-nobuild),$(modules-names))
- $(extra-modules-build:%=$(objpfx)%.so): $(objpfx)%.so: \
-- $(objpfx)%.os $(common-objpfx)shlib.lds \
-+ $(objpfx)%.os $(shlib-lds) \
- $(common-objpfx)libc.so $(common-objpfx)libc_nonshared.a
- $(build-module)
- endif
-diff --git a/iconvdata/extra-module.mk b/iconvdata/extra-module.mk
-index 163074f..43f4e12 100644
---- a/iconvdata/extra-module.mk
-+++ b/iconvdata/extra-module.mk
-@@ -4,7 +4,7 @@ extra-modules-left := $(strip $(filter-out $(mod),$(extra-modules-left)))
- extra-objs := $(extra-objs) $(patsubst %,%.os,$($(mod)-routines))
+ /* Now convert from the internal format into the external buffer. */
+ result = (*cc->__codecvt_do_out) (cc, &fp->_wide_data->_IO_state,
+ data, data + to_do, &new_data,
+- fp->_IO_write_ptr,
+- fp->_IO_buf_end,
+- &fp->_IO_write_ptr);
++ write_ptr,
++ buf_end,
++ &write_ptr);
- $(objpfx)$(mod).so: $(addprefix $(objpfx),$(addsuffix .os,$($(mod)-routines)))\
-- $(common-objpfx)shlib.lds
-+ $(shlib-lds)
- $(build-module-asneeded)
+ /* Write out what we produced so far. */
+- if (_IO_new_do_write (fp, fp->_IO_write_base,
+- fp->_IO_write_ptr - fp->_IO_write_base) == EOF)
++ if (_IO_new_do_write (fp, write_base, write_ptr - write_base) == EOF)
+ /* Something went wrong. */
+ return WEOF;
- # Depend on libc.so so a DT_NEEDED is generated in the shared objects.
-commit f781ef4015504e8a1da649c266584976238aa079
-Author: Roland McGrath <roland@hack.frob.com>
-Date: Sat Jun 11 04:16:49 2011 -0700
+commit a39208bd7fb76c1b01c127b4c61f9bfd915bfe7c
+Author: Carlos O'Donell <carlos@redhat.com>
+Date: Wed Nov 19 11:44:12 2014 -0500
- Add --with-default-link configure option.
+ CVE-2014-7817: wordexp fails to honour WRDE_NOCMD.
+
+ The function wordexp() fails to properly handle the WRDE_NOCMD
+ flag when processing arithmetic inputs in the form of "$((... ``))"
+ where "..." can be anything valid. The backticks in the arithmetic
+ epxression are evaluated by in a shell even if WRDE_NOCMD forbade
+ command substitution. This allows an attacker to attempt to pass
+ dangerous commands via constructs of the above form, and bypass
+ the WRDE_NOCMD flag. This patch fixes this by checking for WRDE_NOCMD
+ in exec_comm(), the only place that can execute a shell. All other
+ checks for WRDE_NOCMD are superfluous and removed.
+
+ We expand the testsuite and add 3 new regression tests of roughly
+ the same form but with a couple of nested levels.
+
+ On top of the 3 new tests we add fork validation to the WRDE_NOCMD
+ testing. If any forks are detected during the execution of a wordexp()
+ call with WRDE_NOCMD, the test is marked as failed. This is slightly
+ heuristic since vfork might be used in the future, but it provides a
+ higher level of assurance that no shells were executed as part of
+ command substitution with WRDE_NOCMD in effect. In addition it doesn't
+ require libpthread or libdl, instead we use the public implementation
+ namespace function __register_atfork (already part of the public ABI
+ for libpthread).
+
+ Tested on x86_64 with no regressions.
-diff --git a/Makerules b/Makerules
-index d3cb4cc..23d9f1c 100644
---- a/Makerules
-+++ b/Makerules
-@@ -479,6 +479,11 @@ endif
- endif
-
- ifeq (yes,$(elf))
-+ifeq (yes,$(use-default-link))
-+# If the linker is good enough, we can let it use its default linker script.
-+shlib-lds =
-+shlib-lds-flags =
-+else
- # binutils only position loadable notes into the first page for binaries,
- # not for shared objects
- $(common-objpfx)shlib.lds: $(common-objpfx)config.make $(..)Makerules
-@@ -516,6 +521,7 @@ common-generated += shlib.lds
-
- shlib-lds = $(common-objpfx)shlib.lds
- shlib-lds-flags = -T $(shlib-lds)
-+endif
-
- define build-shlib
- $(build-shlib-helper) -o $@ $(shlib-lds-flags) \
-diff --git a/config.make.in b/config.make.in
-index 0656b1b..34842bf 100644
---- a/config.make.in
-+++ b/config.make.in
-@@ -69,6 +69,7 @@ have-cc-with-libunwind = @libc_cv_cc_with_libunwind@
- fno-unit-at-a-time = @fno_unit_at_a_time@
- bind-now = @bindnow@
- have-hash-style = @libc_cv_hashstyle@
-+use-default-link = @use_default_link@
-
- static-libgcc = @libc_cv_gcc_static_libgcc@
-
-diff --git a/configure b/configure
-index 20e7340..e8ad775 100755
---- a/configure
-+++ b/configure
-@@ -696,6 +696,7 @@ force_install
- bindnow
- oldest_abi
- enable_check_abi
-+use_default_link
- with_cvs
- with_fp
- ac_ct_CXX
-@@ -770,6 +771,7 @@ with_selinux
- with_xcoff
- with_cvs
- with_headers
-+with_default_link
- enable_sanity_checks
- enable_check_abi
- enable_shared
-@@ -1464,6 +1466,7 @@ Optional Packages:
- --without-cvs if CVS should not be used
- --with-headers=PATH location of system headers to use (for example
- /usr/src/linux/include) [default=compiler default]
-+ --with-default-link do not use explicit linker scripts [default=no]
- --with-tls enable support for TLS
- --without-__thread do not use TLS features even when supporting them
- --with-cpu=CPU select code for CPU variant
-@@ -3581,6 +3584,16 @@ else
- fi
+diff --git a/posix/wordexp-test.c b/posix/wordexp-test.c
+index 4957006..bdd65e4 100644
+--- a/posix/wordexp-test.c
++++ b/posix/wordexp-test.c
+@@ -27,6 +27,25 @@
+ #define IFS " \n\t"
++extern void *__dso_handle __attribute__ ((__weak__, __visibility__ ("hidden")));
++extern int __register_atfork (void (*) (void), void (*) (void), void (*) (void), void *);
+
++static int __app_register_atfork (void (*prepare) (void), void (*parent) (void), void (*child) (void))
++{
++ return __register_atfork (prepare, parent, child,
++ &__dso_handle == NULL ? NULL : __dso_handle);
++}
+
-+# Check whether --with-default-link was given.
-+if test "${with_default_link+set}" = set; then :
-+ withval=$with_default_link; use_default_link=$withval
-+else
-+ use_default_link=no
-+fi
++/* Number of forks seen. */
++static int registered_forks;
+
++/* For each fork increment the fork count. */
++static void
++register_fork (void)
++{
++ registered_forks++;
++}
+
- # Check whether --enable-sanity-checks was given.
- if test "${enable_sanity_checks+set}" = set; then :
- enableval=$enable_sanity_checks; enable_sanity=$enableval
-diff --git a/configure.in b/configure.in
-index f2b3921..f34aab3 100644
---- a/configure.in
-+++ b/configure.in
-@@ -114,6 +114,14 @@ AC_ARG_WITH([headers],
- [sysheaders=$withval],
- [sysheaders=''])
+ struct test_case_struct
+ {
+ int retval;
+@@ -206,6 +225,12 @@ struct test_case_struct
+ { WRDE_SYNTAX, NULL, "$((2+))", 0, 0, { NULL, }, IFS },
+ { WRDE_SYNTAX, NULL, "`", 0, 0, { NULL, }, IFS },
+ { WRDE_SYNTAX, NULL, "$((010+4+))", 0, 0, { NULL }, IFS },
++ /* Test for CVE-2014-7817. We test 3 combinations of command
++ substitution inside an arithmetic expression to make sure that
++ no commands are executed and error is returned. */
++ { WRDE_CMDSUB, NULL, "$((`echo 1`))", WRDE_NOCMD, 0, { NULL, }, IFS },
++ { WRDE_CMDSUB, NULL, "$((1+`echo 1`))", WRDE_NOCMD, 0, { NULL, }, IFS },
++ { WRDE_CMDSUB, NULL, "$((1+$((`echo 1`))))", WRDE_NOCMD, 0, { NULL, }, IFS },
+
+ { -1, NULL, NULL, 0, 0, { NULL, }, IFS },
+ };
+@@ -258,6 +283,15 @@ main (int argc, char *argv[])
+ return -1;
+ }
-+AC_SUBST(use_default_link)
-+AC_ARG_WITH([default-link],
-+ AC_HELP_STRING([--with-default-link],
-+ [do not use explicit linker scripts
-+ @<:@default=no@:>@]),
-+ [use_default_link=$withval],
-+ [use_default_link=no])
++ /* If we are not allowed to do command substitution, we install
++ fork handlers to verify that no forks happened. No forks should
++ happen at all if command substitution is disabled. */
++ if (__app_register_atfork (register_fork, NULL, NULL) != 0)
++ {
++ printf ("Failed to register fork handler.\n");
++ return -1;
++ }
+
- AC_ARG_ENABLE([sanity-checks],
- AC_HELP_STRING([--disable-sanity-checks],
- [really do not use threads (should not be used except in special situations) @<:@default=yes@:>@]),
-commit 5c55070081c27168d27145afdf6a92cd56c9abb3
-Author: Roland McGrath <roland@hack.frob.com>
-Date: Sat Jun 11 00:45:12 2011 -0700
-
- Use linker --print-output-format option if available.
-
-diff --git a/Makerules b/Makerules
-index d70a196..a8b575c 100644
---- a/Makerules
-+++ b/Makerules
-@@ -990,10 +990,14 @@ install: $(inst_slibdir)/libc.so$(libc.so-version)
- $(common-objpfx)format.lds: $(..)scripts/output-format.sed \
- $(common-objpfx)config.make \
- $(common-objpfx)config.h $(..)Makerules
-+ifneq (unknown,$(output-format))
-+ echo > $@.new 'OUTPUT_FORMAT($(output-format))'
-+else
- $(LINK.o) -shared $(sysdep-LDFLAGS) $(config-LDFLAGS) $(LDFLAGS.so) \
- -x c /dev/null -o $@.so -Wl,--verbose -v 2>&1 \
- | sed -n -f $< > $@.new
- rm -f $@.so
-+endif
- mv -f $@.new $@
- common-generated += format.lds
+ for (test = 0; test_case[test].retval != -1; test++)
+ if (testit (&test_case[test]))
+ ++fail;
+@@ -367,6 +401,9 @@ testit (struct test_case_struct *tc)
-diff --git a/config.make.in b/config.make.in
-index b73b21e..407ebc1 100644
---- a/config.make.in
-+++ b/config.make.in
-@@ -70,6 +70,7 @@ fno-unit-at-a-time = @fno_unit_at_a_time@
- bind-now = @bindnow@
- have-hash-style = @libc_cv_hashstyle@
- use-default-link = @use_default_link@
-+output-format = @libc_cv_output_format@
+ printf ("Test %d (%s): ", ++tests, tc->words);
- static-libgcc = @libc_cv_gcc_static_libgcc@
++ if (tc->flags & WRDE_NOCMD)
++ registered_forks = 0;
++
+ if (tc->flags & WRDE_APPEND)
+ {
+ /* initial wordexp() call, to be appended to */
+@@ -378,6 +415,13 @@ testit (struct test_case_struct *tc)
+ }
+ retval = wordexp (tc->words, &we, tc->flags);
-diff --git a/configure b/configure
-index 2568345..55a4b30 100755
---- a/configure
-+++ b/configure
-@@ -647,6 +647,7 @@ libc_cv_have_initfini
- gnu89_inline
- libc_cv_ssp
- fno_unit_at_a_time
-+libc_cv_output_format
- libc_cv_hashstyle
- libc_cv_fpie
- libc_cv_z_execstack
-@@ -6703,6 +6704,24 @@ $as_echo "$libc_cv_hashstyle" >&6; }
++ if ((tc->flags & WRDE_NOCMD)
++ && (registered_forks > 0))
++ {
++ printf ("FAILED fork called for WRDE_NOCMD\n");
++ return 1;
++ }
++
+ if (tc->flags & WRDE_DOOFFS)
+ start_offs = sav_we.we_offs;
- fi
+diff --git a/posix/wordexp.c b/posix/wordexp.c
+index b6b65dd..26f3a26 100644
+--- a/posix/wordexp.c
++++ b/posix/wordexp.c
+@@ -893,6 +893,10 @@ exec_comm (char *comm, char **word, size_t *word_length, size_t *max_length,
+ pid_t pid;
+ int noexec = 0;
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking linker output format" >&5
-+$as_echo_n "checking linker output format... " >&6; }
-+if ${libc_cv_output_format+:} false; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ if libc_cv_output_format=`
-+${CC-cc} -nostartfiles -nostdlib -Wl,--print-output-format 2>&5`
-+then
-+ :
-+else
-+ libc_cv_output_format=
-+fi
-+test -n "$libc_cv_output_format" || libc_cv_output_format=unknown
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_output_format" >&5
-+$as_echo "$libc_cv_output_format" >&6; }
-+
++ /* Do nothing if command substitution should not succeed. */
++ if (flags & WRDE_NOCMD)
++ return WRDE_CMDSUB;
+
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fno-toplevel-reorder -fno-section-anchors" >&5
- $as_echo_n "checking for -fno-toplevel-reorder -fno-section-anchors... " >&6; }
- if ${libc_cv_fno_toplevel_reorder+:} false; then :
-diff --git a/configure.in b/configure.in
-index 55e5649..a28cd70 100644
---- a/configure.in
-+++ b/configure.in
-@@ -1803,6 +1803,17 @@ EOF
- AC_SUBST(libc_cv_hashstyle)
- fi
+ /* Don't fork() unless necessary */
+ if (!comm || !*comm)
+ return 0;
+@@ -2082,9 +2086,6 @@ parse_dollars (char **word, size_t *word_length, size_t *max_length,
+ }
+ }
-+AC_CACHE_CHECK(linker output format, libc_cv_output_format, [dnl
-+if libc_cv_output_format=`
-+${CC-cc} -nostartfiles -nostdlib -Wl,--print-output-format 2>&AS_MESSAGE_LOG_FD`
-+then
-+ :
-+else
-+ libc_cv_output_format=
-+fi
-+test -n "$libc_cv_output_format" || libc_cv_output_format=unknown])
-+AC_SUBST(libc_cv_output_format)
-+
- AC_CACHE_CHECK(for -fno-toplevel-reorder -fno-section-anchors, libc_cv_fno_toplevel_reorder, [dnl
- cat > conftest.c <<EOF
- int foo;
+- if (flags & WRDE_NOCMD)
+- return WRDE_CMDSUB;
+-
+ (*offset) += 2;
+ return parse_comm (word, word_length, max_length, words, offset, flags,
+ quoted? NULL : pwordexp, ifs, ifs_white);
+@@ -2196,9 +2197,6 @@ parse_dquote (char **word, size_t *word_length, size_t *max_length,
+ break;
+
+ case '`':
+- if (flags & WRDE_NOCMD)
+- return WRDE_CMDSUB;
+-
+ ++(*offset);
+ error = parse_backtick (word, word_length, max_length, words,
+ offset, flags, NULL, NULL, NULL);
+@@ -2357,12 +2355,6 @@ wordexp (const char *words, wordexp_t *pwordexp, int flags)
+ break;
+
+ case '`':
+- if (flags & WRDE_NOCMD)
+- {
+- error = WRDE_CMDSUB;
+- goto do_error;
+- }
+-
+ ++words_offset;
+ error = parse_backtick (&word, &word_length, &max_length, words,
+ &words_offset, flags, pwordexp, ifs,
projects / packages / glibc.git / blobdiff