[glibc/ibm/2.30/master] Merge branch release/2.30/master into ibm/2.30/master

[Raphael Zinsly <rzinsly@sourceware.org>]

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=903f0b694220b246dfe5ffe128e6766db813dd52

commit 903f0b694220b246dfe5ffe128e6766db813dd52
Merge: 3e33d93073 1bf07898c9
Author: Raphael Moreira Zinsly <rzinsly@linux.ibm.com>
Date:   Thu Mar 18 18:05:13 2021 -0300

    Merge branch release/2.30/master into ibm/2.30/master

Diff:

 NEWS                                               |   3 +
 elf/Makefile                                       |   2 +
 elf/ifuncmain6pie.c                                |  14 +--
 elf/ifuncmod6.c                                    |   8 +-
 iconvdata/Makefile                                 |   4 +-
 iconvdata/bug-iconv14.c                            | 127 +++++++++++++++++++++
 iconvdata/iso-2022-jp-3.c                          |  67 ++++++++---
 nscd/netgroupcache.c                               |   4 +-
 sysdeps/i386/dl-machine.h                          |  16 ++-
 sysdeps/x86/Makefile                               |   6 +
 sysdeps/x86/dl-cet.c                               |   6 +-
 sysdeps/x86/tst-setjmp-cet.c                       |   1 +
 sysdeps/x86_64/dl-machine.h                        |  16 ++-
 .../x86_64/multiarch/memmove-vec-unaligned-erms.S  |  21 ++++
 14 files changed, 247 insertions(+), 48 deletions(-)

diff --cc NEWS
index ecf91b04ab,4926a57f3a..d2c2a0ec67
--- a/NEWS
+++ b/NEWS
@@@ -25,15 -25,9 +25,16 @@@ CVE-2020-1751: A defect in the PowerPC 
  CVE-2020-1752: A use-after-free vulnerability in the glob function when
    expanding ~user has been fixed.
  
 +CVE-2020-27618: An infinite loop has been fixed in the iconv program when
 +  invoked with input containing redundant shift sequences in the IBM1364,
 +  IBM1371, IBM1388, IBM1390, or IBM1399 character sets.
 +
 +CVE-2020-29562: An assertion failure has been fixed in the iconv function
 +  when invoked with UCS4 input containing an invalid character.
 +
  The following bugs are resolved with this release:
  
+   [20019] NULL pointer dereference in libc.so.6 IFUNC due to uninitialized GOT
    [20543] Please move from .gnu.linkonce to comdat
    [23296] Data race in setting function descriptor during lazy binding
    [23518] login: Remove utmp backend jump tables