]> git.ipfire.org Git - thirdparty/glibc.git/commitdiff
Merge branch 'release/2.20/master' into ibm/2.20/master
authorTulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com>
Fri, 26 Feb 2016 14:09:16 +0000 (11:09 -0300)
committerTulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com>
Fri, 26 Feb 2016 14:09:16 +0000 (11:09 -0300)
1  2 
ChangeLog
NEWS
resolv/nss_dns/dns-host.c

diff --cc ChangeLog
index a3173c6531d876eee2bb54b28de12a0a85541b93,4d4905b0e1a0b521efaf16959f25b1c1b75fbfb8..be44ffd75031e31d8f2007ed8376872c5ae86525
+++ b/ChangeLog
+ 2016-02-25  Carlos O'Donell  <carlos@redhat.com>
+       [BZ #18665]
+       * resolv/nss_dns/dns-host.c (gaih_getanswer_slice): Always set
+       *herrno_p.
+       (gaih_getanswer): Document functional behviour. Return tryagain
+       if any result is tryagain.
+       * resolv/res_query.c (__libc_res_nsearch): Set buffer size to zero
+       when freed.
+       * resolv/res_send.c: Add copyright text.
+       (__libc_res_nsend): Document that MAXPACKET is expected.
+       (send_vc): Document. Remove buffer reuse.
+       (send_dg): Document. Remove buffer reuse. Set *thisanssizp to set the
+       size of the buffer. Add Dprint for truncated UDP buffer.
+ 2016-02-25  Andreas Schwab  <schwab@suse.de>
+       [BZ #18032]
+       * posix/fnmatch_loop.c (FCT): Remove extra increment when skipping
+       over collating symbol inside a bracket expression.  Minor cleanup.
+       * posix/tst-fnmatch3.c (do_test): Add test case.
+ 2016-02-25  Paul Pluzhnikov  <ppluzhnikov@google.com>
+       [BZ #17269]
+       * libio/wstrops.c (_IO_wstr_overflow): Guard against integer overflow
+       (enlarge_userbuf): Likewise.
+ 2016-02-25  Florian Weimer  <fweimer@redhat.com>
+       [BZ #19018]
+       * stdlib/cxa_thread_atexit_impl.c (__cxa_thread_atexit_impl):
+       Mangle function pointer before storing it.
+       (__call_tls_dtors): Demangle function pointer before calling it.
+ 2016-02-25  Florian Weimer  <fweimer@redhat.com>
+       [BZ #18928]
+       * sysdeps/generic/ldsodefs.h (struct rtld_global_ro): Remove
+       _dl_pointer_guard member.
+       * elf/rtld.c (_rtld_global_ro): Remove _dl_pointer_guard
+       initializer.
+       (security_init): Always set up pointer guard.
+       (process_envvars): Do not process LD_POINTER_GUARD.
+ 2015-07-21  Mike Frysinger  <vapier@gentoo.org>
+       [BZ #18694]
+       * sysdeps/unix/sysv/linux/sparc/bits/sigaction.h: Include
+       bits/wordsize.h.
+       (sigaction): Declare __glibc_reserved0 only when __WORDSIZE is 64.
 +2015-09-01  Paul E. Murphy  <murphyp@linux.vnet.ibm.com>
 +
 +      * sysdeps/powerpc/powerpc32/sysdep.h (ABORT_TRANSACTION): Use
 +      register other than r0 for tabort, it has special meaning.
 +      * sysdeps/powerpc/powerpc64/sysdep.h (ABORT_TRANSACTION): Likewise
 +      * sysdeps/unix.sysv/linux/powerpc/syscall.S (syscall): Abort
 +      transaction before starting syscall.
 +
 +2015-09-01  Paul E. Murphy  <murphyp@linux.vnet.ibm.com>
 +
 +      * sysdeps/unix/sysv/linux/powerpc/elision-lock.c
 +      (__arch_compare_and_exchange_val_32_acq): Remove and use common
 +      definition.  ISA 2.07B no longer requires full sync.
 +
 +2015-05-11  Andreas Schwab  <schwab@suse.de>
 +
 +      [BZ #18007]
 +      * nis/nss_compat/compat-grp.c (internal_endgrent): Don't call
 +      nss_endgrent.
 +      (_nss_compat_endgrent): Call nss_endgrent.
 +      * nis/nss_compat/compat-pwd.c (internal_endpwent): Don't call
 +      nss_endpwent.
 +      (_nss_compat_endpwent): Call nss_endpwent.
 +      * nis/nss_compat/compat-spwd.c (internal_setspent): Add parameter
 +      needent, call nss_setspent only if non-zero.
 +      (_nss_compat_setspent, _nss_compat_getspent_r): Pass non-zero.
 +      (internal_endspent): Don't call nss_endspent.
 +      (_nss_compat_endspent): Call nss_endspent.
 +      * nss/nss_files/files-XXX.c (position, last_use, keep_stream):
 +      Remove.  All uses removed.
 +      (internal_setent): Remove parameter stayopen, add parameter
 +      stream.  Use it instead of global variable.
 +      (CONCAT(_nss_files_set,ENTNAME)): Pass global stream.
 +      (internal_endent, internal_getent): Add parameter stream.  Use it
 +      instead of global variable.
 +      (CONCAT(_nss_files_end,ENTNAME))
 +      (CONCAT(_nss_files_get,ENTNAME_r)): Pass global stream.
 +      (_nss_files_get##name##_r): Pass local stream.  Remove locking.
 +      * nss/nss_files/files-alias.c (position, last_use): Remove.  All
 +      uses removed.
 +      (internal_setent, internal_endent): Add parameter stream.  Use it
 +      instead of global variable.
 +      (_nss_files_setaliasent, _nss_files_endaliasent): Pass global
 +      stream.
 +      (get_next_alias): Add parameter stream.
 +      (_nss_files_getaliasent_r): Pass global stream.
 +      (_nss_files_getaliasbyname_r): Pass local stream.  Remove locking.
 +      * nss/nss_files/files-hosts.c (_nss_files_gethostbyname3_r)
 +      (_nss_files_gethostbyname4_r): Pass local stream to
 +      internal_setent, internal_getent and internal_endent.  Remove
 +      locking.
 +
 +2015-04-29  Florian Weimer  <fweimer@redhat.com>
 +
 +      [BZ #18007]
 +      * nss/nss_files/files-XXX.c (CONCAT): Always enable stayopen.
 +      (CVE-2014-8121)
 +      * nss/tst-nss-getpwent.c: New file.
 +      * nss/Makefile (tests): Add new test.
 +
 +2015-04-21  Arjun Shankar  <arjun.is@lostca.se>
 +
 +      [BZ #18287]
 +      * resolv/nss_dns/dns-host.c (getanswer_r): Adjust buffer length
 +      based on padding.  (CVE-2015-1781)
 +
 +2015-03-10  Adhemerval Zanella  <azanella@linux.vnet.ibm.com>
 +
 +      * sysdeps/ieee754/dbl-64/Makefile (CFLAGS-e_pow.c): Add
 +      $(config-cflags-nofma).
 +
 +2015-02-23  Paul Pluzhnikov  <ppluzhnikov@google.com>
 +
 +      [BZ #16618]
 +      * stdio-common/tst-sscanf.c (main): Test for buffer overflow.
 +      * stdio-common/vfscanf.c (_IO_vfscanf_internal): Compute needed
 +      size in bytes. Store needed elements in wpmax. Use needed size
 +      in bytes for extend_alloca.
 +
 +2015-02-12  Adhemerval Zanella  <azanella@linux.vnet.ibm.com>
 +
 +      * sysdeps/unix/sysv/linux/powerpc/htm.h [TABORT]: Fix encoding for
 +      little endian.
 +
 +2014-01-20  Adhemerval Zanella  <azanella@linux.vnet.ibm.com>
 +
 +      * sysdeps/powerpc/nptl/tls.h (tcbhead_t): Add tm_capable field.
 +      (TLS_INIT_TP): Add tm_capable initialization.
 +      (TLS_DEFINE_INIT_TP): Likewise.
 +      (THREAD_GET_TM_CAPABLE): New file: get tm_capable field value from
 +      TCB.
 +      (THREAD_SET_TM_CAPABLE): New file: set tm_capable field value in TCB.
 +      * sysdeps/powerpc/nptl/tcb-offsets.sym (TM_CAPABLE): Add field offset
 +      calculation.
 +      * sysdeps/powerpc/powerpc32/sysdep.h (DO_CALL): Abort hardware
 +      transactoion is lock elision is built and TCB tm_capable is set.
 +      * sysdeps/powerpc/powerpc64/sysdep.h (DO_CALL): Likewise.
 +      * sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h
 +      (INTERNAL_SYSCALL_NCS): Likewise.
 +      * sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h
 +      (INTERNAL_SYSCALL_NCS): Likewise.
 +      * sysdeps/powerpc/sysdep.h (ABORT_TRANSACTION): New define.
 +
 +      * sysdeps/powerpc/nptl/elide.h: New file: generic lock elision support
 +      for powerpc.
 +      * sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h
 +      [pthread_rwlock_t] (__pad1): Change size to 7 bytes in 64 bits case
 +      and remove it for 32 bits case.
 +      [pthread_rwlock_t] (__rwelision): New field for lock elision.
 +      (__PTHREAD_RWLOCK_ELISION_EXTRA): Adjust for new lock elision field
 +      initialization.
 +      * sysdeps/unix/sysv/linux/powerpc/elision-conf.c (elision_init):
 +      Disable lock elision with rdlocks if elision is not available.
 +
 +      * sysdeps/unix/sysv/linux/powerpc/Makefile [nptl]
 +      (sysdep_routines): Add lock elision objects.
 +      * sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h
 +      [pthread_mutex_t] (__spins): Rework to add lock elision field.
 +      [pthread_mutex_t] (__elision): Add field.
 +      [__PTHREAD_SPINS]: Adjust to init lock elision field.
 +      * sysdeps/unix/sysv/linux/powerpc/elision-conf.c: New file: lock
 +      elision definitions for powerpc.
 +      * sysdeps/unix/sysv/linux/powerpc/elision-lock.c: New file:
 +      implementation of lock elision for powerpc.
 +      * sysdeps/unix/sysv/linux/powerpc/elision-timed.c: New file:
 +      implementation of timed lock elision for powerpc.
 +      * sysdeps/unix/sysv/linux/powerpc/elision-trylock.c: New file:
 +      implementation of trylock with lock elision for powerpc.
 +      * sysdeps/unix/sysv/linux/powerpc/elision-unlock.c: New file:
 +      implementaion of unlock for lock elision for powerpc.
 +      * sysdeps/unix/sysv/linux/powerpc/force-elision.h: New file:
 +      automatic enable lock elision for mutexes.
 +      * sysdeps/unix/sysv/linux/powerpc/htm.h: New file: hardware
 +      transaction execution definitions for powerpc.
 +      * sysdeps/unix/sysv/linux/powerpc/lowlevellock.h: New file: add TLE
 +      definitions.
 +      * sysdeps/unix/sysv/linux/powerpc/pthread_mutex_cond_lock.c: New file.
 +      * sysdeps/unix/sysv/linux/powerpc/pthread_mutex_lock.c: Likewise.
 +      * sysdeps/unix/sysv/linux/powerpc/pthread_mutex_timedlock.c: Likewise.
 +      * sysdeps/unix/sysv/linux/powerpc/pthread_mutex_trylock.c: Likewise.
 +      * NEWS: Update.
 +
 +2015-01-13  Adhemerval Zanella  <azanella@linux.vnet.ibm.com>
 +
 +      * sysdeps/powerpc/powerpc64/power7/memcmp.S (memcmp): Fix performance
 +      regression on LE.
 +
 +      * sysdeps/powerpc/powerpc64/multiarch/strncmp-power8.S: New file.
 +      * sysdeps/powerpc/powerpc64/power8/strncmp.S: New file.
 +      * sysdeps/powerpc/powerpc64/multiarch/Makefile [sysdep_routines]: Add
 +      strncmp-power8 object.
 +      * sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c
 +      (__libc_ifunc_impl_list): Add __strncmp_power8 implementation.
 +      * sysdeps/powerpc/powerpc64/multiarch/strncmp.c (strncmp): Likewise.
 +      * NEWS: Update.
 +
 +2015-01-13  Rajalakshmi Srinivasaraghavan  <raji@linux.vnet.ibm.com>
 +          Adhemerval Zanella  <azanella@linux.vnet.ibm.com>
 +
 +      * sysdeps/powerpc/powerpc64/power7/strcmp.S (strcmp): Optimize
 +      trailing byte check.
 +
 +2015-01-13  Adhemerval Zanella  <azanella@linux.vnet.ibm.com>
 +
 +      * sysdeps/powerpc/powerpc64/multiarch/Makefile [sysdep_routines]:
 +      Add strcmp-power8 object.
 +      * sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c
 +      (__libc_ifunc_impl_list): Add __strcmp_power8 implementation.
 +      * sysdeps/powerpc/powerpc64/multiarch/strcmp-power8.S: New file.
 +      * sysdeps/powerpc/powerpc64/multiarch/strcmp.c (strcmp): Add
 +      __strcmp_power8 implementation.
 +      * sysdeps/powerpc/powerpc64/power8/strcmp.S: New file.
 +      * NEWS: Update.
 +
 +      * sysdeps/powerpc/powerpc64/multiarch/Makefile [sysdep_routines]:
 +      Add strncpy-power8 and stpncpy-power8 objects.
 +      * sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c
 +      (__libc_ifunc_impl_list): Add __strncpy_power8 and stpncpy_power8
 +      implementations.
 +      * sysdeps/powerpc/powerpc64/multiarch/stpncpy-power8.S: New file.
 +      * sysdeps/powerpc/powerpc64/multiarch/stpncpy.c (__stpncpy): Add
 +      __stpncpy_power8 implementation.
 +      * sysdeps/powerpc/powerpc64/multiarch/strncpy-power8.S: New file.
 +      * sysdeps/powerpc/powerpc64/multiarch/strncpy.c (strncpy): Add
 +      __strncpy_power8 implementation.
 +      * sysdeps/powerpc/powerpc64/power8/stpncpy.S: New file.
 +      * sysdeps/powerpc/powerpc64/power8/strncpy.S: New file.
 +      * NEWS: Update.
 +
 +      * sysdeps/powerpc/powerpc64/multiarch/strncat-power7.c: New file.
 +      * sysdeps/powerpc/powerpc64/multiarch/strncat-power7.S: Remove file.
 +      * sysdeps/powerpc/powerpc64/power7/strncat.S: Likewise.
 +
 +      * sysdeps/powerpc/powerpc64/multiarch/Makefile [sysdep_routines]: Add
 +      strncat-power8 object.
 +      * sysdeps/powerpc/powerpc64/multiarch/strcat.c (strcat): Add
 +      __strcat_power8 implementation.
 +      * sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c
 +      (__libc_ifunc_impl_list): Add __strcat_power8 implementation.
 +      * sysdeps/powerpc/powerpc64/multiarch/strcat-power8.c: New file:
 +      optimized strcat for power8.
 +
 +      * sysdeps/powerpc/powerpc64/multiarch/Makefile [sysdep_routines]: Add
 +      strcpy-power8 and stpcpy-power8 objects.
 +      * sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c
 +      (__libc_ifunc_impl_list): Add __strcpy_power8 and __stpcpy_power8
 +      implementations.
 +      * sysdeps/powerpc/powerpc64/multiarch/stpcpy-power8.S: New file:
 +      multiarch stpcpy implementation for POWER8.
 +      * sysdeps/powerpc/powerpc64/multiarch/strcpy-power8.S: New file;
 +      multiarch strcpy implementation for POWER8.
 +      * sysdeps/powerpc/powerpc64/multiarch/strcpy.c (strcpy): Add
 +      __strcpy_power8 function.
 +      * sysdeps/powerpc/powerpc64/power8/stpcpy.S: New file: optimized
 +      stpcpy for POWER8.
 +      * sysdeps/powerpc/powerpc64/power8/strcpy.S: New file: optimized
 +      strcpy for POWER8.
 +      * NEWS: Update.
 +
 +2014-12-31  Rajalakshmi Srinivasaraghavan  <raji@linux.vnet.ibm.com>
 +          Adhemerval Zanella  <azanella@linux.vnet.ibm.com>
 +
 +      * sysdeps/powerpc/powerpc64/power7/strcpy.S (strcpy): Optimize unaligned
 +      path.
 +      * benchtests/bench-strcpy.c (test_main): Add more unaligned inputs.
 +
 +2014-12-16  Florian Weimer  <fweimer@redhat.com>
 +
 +      [BZ #17630]
 +      * resolv/nss_dns/dns-network.c (getanswer_r): Iterate over alias
 +      names.
 +
 +2014-12-15  Jeff Law  <law@redhat.com>
 +
 +      [BZ #16617]
 +      * stdio-common/vfprintf.c (vfprintf): Allocate large specs array
 +      on the heap.  (CVE-2012-3406)
 +      * stdio-common/bug23-2.c, stdio-common/bug23-3.c: New file.
 +      * stdio-common/bug23-4.c: New file.  Test case by Joseph Myers.
 +      * stdio-common/Makefile (tests): Add bug23-2, bug23-3, bug23-4.
 +
 +2014-12-02  Adhemerval Zanella  <azanella@linux.vnet.ibm.com>
 +
 +      * sysdeps/powerpc/powerpc64/multiarch/Makefile [sysdep_routines]:
 +      Remove strpbrk objects.
 +      * sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c
 +      (__libc_ifunc_impl_list): Remove strpbrk implementation.
 +      * sysdeps/powerpc/powerpc64/multiarch/strpbrk-ppc64.c: Remove file.
 +      * sysdeps/powerpc/powerpc64/multiarch/strpbrk.c: Remove file.
 +      * sysdeps/powerpc/powerpc64/power7/strpbrk.S: Remove file.
 +      * sysdeps/powerpc/powerpc64/strpbrk.S: New file.
 +
 +      * sysdeps/powerpc/powerpc64/multiarch/Makefile [sysdep_routines]:
 +      Remove strcspn objects.
 +      * sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c
 +      (__libc_ifunc_impl_list): Remove strcspn implementation.
 +      * sysdeps/powerpc/powerpc64/multiarch/strcspn-ppc64.c: Remove file.
 +      * sysdeps/powerpc/powerpc64/multiarch/strcspn.c: Remove file.
 +      * sysdeps/powerpc/powerpc64/power7/strcspn.S: Remove file.
 +      * sysdeps/powerpc/powerpc64/strcspn.S: New file.
 +
 +      * sysdeps/powerpc/powerpc64/multiarch/Makefile [sysdep_routines]:
 +      Remove strspn objetcs.
 +      * sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c
 +      (__libc_ifunc_impl_list): Remove strspn implementation.
 +      * sysdeps/powerpc/powerpc64/multiarch/strspn-power7.S: Remove file.
 +      * sysdeps/powerpc/powerpc64/multiarch/strspn-ppc64.c: Likewise.
 +      * sysdeps/powerpc/powerpc64/power7/strspn.S: Remove file.
 +      * sysdeps/powerpc/powerpc64/strspn.S: New file.
 +
 +2014-12-01  Rajalakshmi Srinivasaraghavan <raji@linux.vnet.ibm.com>
 +
 +      * sysdeps/powerpc/powerpc64/strtok.S: New file.
 +      * sysdeps/powerpc/powerpc64/strtok_r.S: New file.
 +
 +2014-11-26  Adhemerval Zanella  <azanella@linux.ibm.com>
 +
 +      * csu/tst-atomic.c (do_test): Add atomic_exchange_and_add_{acq,rel}
 +      tests.
 +      * sysdeps/powerpc/bits/atomic.h
 +      (__arch_atomic_exchange_and_add_32_acq): Add definition.
 +      (__arch_atomic_exchange_and_add_32_rel): Likewise.
 +      (atomic_exchange_and_add_acq): Likewise.
 +      (atomic_exchange_and_add_rel): Likewise.
 +      * sysdeps/powerpc/powerpc32/bits/atomic.h
 +      (__arch_atomic_exchange_and_add_64_acq): Add definition.
 +      (__arch_atomic_exchange_and_add_64_rel): Likewise.
 +      * sysdeps/powerpc/powerpc64/bits/atomic.h
 +      (__arch_atomic_exchange_and_add_64_acq): Add definition.
 +      (__arch_atomic_exchange_and_add_64_rel): Likewise.
 +
 +2014-11-25  Anton Blanchard <anton@samba.org>
 +
 +      * sysdeps/powerpc/bits/atomic.h
 +      (__arch_compare_and_exchange_bool_64_rel): Load from mem.
 +
 +2014-11-19  Carlos O'Donell  <carlos@redhat.com>
 +          Florian Weimer  <fweimer@redhat.com>
 +          Joseph Myers  <joseph@codesourcery.com>
 +          Adam Conrad  <adconrad@0c3.net>
 +          Andreas Schwab  <schwab@suse.de>
 +          Brooks  <bmoses@google.com>
 +
 +      [BZ #17625]
 +      * wordexp-test.c (__dso_handle): Add prototype.
 +      (__register_atfork): Likewise.
 +      (__app_register_atfork): New function.
 +      (registered_forks): New global.
 +      (register_fork): New function.
 +      (test_case): Add 3 new tests for WRDE_CMDSUB.
 +      (main): Call __app_register_atfork.
 +      (testit): If WRDE_NOCMD set registered_forks to zero, run test, and if
 +      fork count is non-zero fail the test.
 +      * posix/wordexp.c (exec_comm): Return WRDE_CMDSUB if WRDE_NOCMD flag
 +      is set.
 +      (parse_dollars): Remove check for WRDE_NOCMD.
 +      (parse_dquote): Likewise.
 +
 +2014-11-05  Adhemerval Zanella  <azanella@linux.vnet.ibm.com>
 +
 +      * sysdeps/powerpc/powerpc64/power8/memset.S (MTVSRD_V1_R4): Simplify
 +      definition.
 +      * sysdeps/powerpc/powerpc64/power8/fpu/s_finite.S (MFVSRD_R3_V1):
 +      Likwise.
 +      * sysdeps/powerpc/powerpc64/power8/fpu/s_isinf.S (MFVSRD_R3_V1):
 +      Likewise.
 +      * sysdeps/powerpc/powerpc64/power8/fpu/s_isnan.S (MFVSRD_R3_V1):
 +      Likewise.
 +      * sysdeps/powerpc/powerpc64/power8/fpu/s_llrint.S (MFVSRD_R3_V1):
 +      Likewise.
 +      * sysdeps/powerpc/powerpc64/power8/fpu/s_llround.S (MFVSRD_R3_V1):
 +      Likewise.
 +
 +2014-11-03  Adhemerval Zanella  <azanella@linux.vnet.ibm.com>
 +
 +      * sysdeps/powerpc/powerpc64/power8/memset.S (MTVSRD_V1_R4): Encode
 +      mtvsrd instruction in binary form.
 +
 +2014-10-31  Torvald Riegel  <triegel@redhat.com>
 +
 +      * sysdeps/powerpc/bits/atomic.h (atomic_write_barrier): Remove and...
 +      * sysdeps/powerpc/powerpc32/bits/atomic.h (atomic_write_barrier):
 +      ... add here and use lwsync or sync ...
 +      * sysdeps/powerpc/powerpc64/bits/atomic.h (atomic_write_barrier):
 +      ... and add here using lwsync.
 +
 +2014-09-10  Adhemerval Zanella  <azanella@linux.vnet.ibm.com>
 +
 +      * benchtests/bench-memset.c (test_main): Add more test from size
 +      from 32 to 512 bytes.
 +      * sysdeps/powerpc/powerpc64/multiarch/Makefile [sysdep_routines]:
 +      Add POWER8 memset object.
 +      * sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c
 +      (__libc_ifunc_impl_list): Add POWER8 memset and bzero implementations.
 +      * sysdeps/powerpc/powerpc64/multiarch/bzero.c (__bzero): Add POWER8
 +      implementation.
 +      * sysdeps/powerpc/powerpc64/multiarch/memset.c (__libc_memset):
 +      Likewise.
 +      * sysdeps/powerpc/powerpc64/multiarch/memset-power8.S: New file:
 +      multiarch POWER8 memset optimization.
 +      * sysdeps/powerpc/powerpc64/power8/memset.S: New file: optimized
 +      POWER8 memset optimization.
 +
 +      * sysdeps/powerpc/powerpc64/multiarch/Makefile [sysdep_routines]:
 +      Remove bzero multiarch objects.
 +      * sysdeps/powerpc/powerpc64/multiarch/bzero-power4.S: Remove file.
 +      * sysdeps/powerpc/powerpc64/multiarch/bzero-power6.S: Likewise.
 +      * sysdeps/powerpc/powerpc64/multiarch/bzero-power7.S: Likewise.
 +      * sysdeps/powerpc/powerpc64/multiarch/memset-power4.S [NO_BZERO_IMPL]:
 +      Remove define.
 +      [__bzero]: Redefine to specific name.
 +      * sysdeps/powerpc/powerpc64/multiarch/memset-power6.S: Likewise.
 +      * sysdeps/powerpc/powerpc64/multiarch/memset-power7.S: Likewise.
 +      * sysdeps/powerpc/powerpc64/power4/memset.S [NO_BZERO_IMPL]: Remove
 +      define.
 +      * sysdeps/powerpc/powerpc64/power6/memset.S: Likewise.
 +      * sysdeps/powerpc/powerpc64/power7/memset.S: Likewise.
 +
  2015-02-16  Paul Pluzhnikov  <ppluzhnikov@google.com>
  
        [BZ #16618]
diff --cc NEWS
index 8e235360b4d71a388aec1e6822e14290a5d3b9c2,53cf5a4d855454236320baa42e96cdd2fa309087..52d14e38be32b3840f1c5f46d6f09b88b176d2af
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -9,31 -9,26 +9,48 @@@ Version 2.20.
  
  * The following bugs are resolved with this release:
  
-   16009, 16617, 16618, 17266, 17370, 17371, 17460, 17485, 17555, 17625,
-   17630, 17801, 18007, 18287.
+   16009, 16617, 16618, 17266, 17269, 17370, 17371, 17460, 17485, 17555,
 -  17625, 17630, 17801, 18032, 18665, 18694, 18928, 19018.
++  17625, 17630, 17801, 18007, 18032, 18287, 18665, 18694, 18928, 19018.
+ * A stack-based buffer overflow was found in libresolv when invoked from
+   libnss_dns, allowing specially crafted DNS responses to seize control
+   of execution flow in the DNS client.  The buffer overflow occurs in
+   the functions send_dg (send datagram) and send_vc (send TCP) for the
+   NSS module libnss_dns.so.2 when calling getaddrinfo with AF_UNSPEC
+   family.  The use of AF_UNSPEC triggers the low-level resolver code to
+   send out two parallel queries for A and AAAA.  A mismanagement of the
+   buffers used for those queries could result in the response of a query
+   writing beyond the alloca allocated buffer created by
+   _nss_dns_gethostbyname4_r.  Buffer management is simplified to remove
+   the overflow.  Thanks to the Google Security Team and Red Hat for
+   reporting the security impact of this issue, and Robert Holiday of
+   Ciena for reporting the related bug 18665. (CVE-2015-7547)
+ * The LD_POINTER_GUARD environment variable can no longer be used to
+   disable the pointer guard feature.  It is always enabled.
  
 +* A buffer overflow in gethostbyname_r and related functions performing DNS
 +  requests has been fixed.  If the NSS functions were called with a
 +  misaligned buffer, the buffer length change due to pointer alignment was
 +  not taken into account.  This could result in application crashes or,
 +  potentially arbitrary code execution, using crafted, but syntactically
 +  valid DNS responses.  (CVE-2015-1781)
 +
 +* CVE-2014-8121 The NSS backends shared internal state between the getXXent
 +  and getXXbyYY NSS calls for the same database, causing a denial-of-service
 +  condition in some applications.
 +
 +* Added support for TSX lock elision of pthread mutexes on powerpc32, powerpc64
 +  and powerpc64le.  This may improve lock scaling of existing programs on
 +  HTM capable systems.  The lock elision code is only enabled with
 +  --enable-lock-elision=yes.  Also, the TSX lock elision implementation for
 +  powerpc will issue a transaction abort on every syscall to avoid side
 +  effects being visible outside transactions.
 +
 +* Optimized strcpy, stpcpy, strncpy, stpncpy, strcmp, and strncmp
 +  implementations for powerpc64/powerpc64le.
 +  Implemented by Adhemerval Zanella (IBM).
 +
  * CVE-2015-1472 Under certain conditions wscanf can allocate too little
    memory for the to-be-scanned arguments and overflow the allocated
    buffer.  The implementation now correctly computes the required buffer
Simple merge