AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-12 16:20:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

nscd: Do not use __inet_aton_exact@GLIBC_PRIVATE [BZ #20018]

Browse Source 
This commit avoids referencing the __inet_aton_exact@GLIBC_PRIVATE
symbol from nscd.  In master, the separately-compiled getaddrinfo
implementation in nscd needs it, however such an internal ABI change
is not desirable on a release branch if it can be avoided.
This commit is contained in:
Florian Weimer 2019-02-04 20:07:18 +01:00
parent 2373941bd7
commit c533244b8e
4 changed files with 49 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2019-02-04 Florian Weimer <fweimer@redhat.com>
[BZ #20018]
nscd: Do not rely on new GLIBC_PRIVATE ABI after CVE-2016-10739 fix.
* nscd/nscd-inet_addr.c: New file. Build resolv/inet_addr.c for
nscd, without public symbols.
* nscd/Makefile (nscd-modules): Add it.
* nscd/gai.c: Include <arpa/inet.h> and change visibility of
__inet_aton_exact.
2019-01-21 Florian Weimer <fweimer@redhat.com>
[BZ #20018]

2
nscd/Makefile
View File

@ -36,7 +36,7 @@ nscd-modules := nscd connections pwdcache getpwnam_r getpwuid_r grpcache \
getsrvbynm_r getsrvbypt_r servicescache \
dbg_log nscd_conf nscd_stat cache mem nscd_setup_thread \
xmalloc xstrdup aicache initgrcache gai res_hconf \
netgroupcache
netgroupcache nscd-inet_addr
ifeq ($(build-nscd)$(have-thread-library),yesyes)

6
nscd/gai.c
View File

@ -33,6 +33,12 @@
#define __getifaddrs getifaddrs
#define __freeifaddrs freeifaddrs
/* We do not want to export __inet_aton_exact. Get the prototype and
change its visibility to hidden. */
#include <arpa/inet.h>
__typeof__ (__inet_aton_exact) __inet_aton_exact
__attribute__ ((visibility ("hidden")));
/* We are nscd, so we don't want to be talking to ourselves. */
#undef USE_NSCD

32
nscd/nscd-inet_addr.c Normal file
View File

@ -0,0 +1,32 @@
/* Legacy IPv4 text-to-address functions. Version for nscd.
Copyright (C) 2019 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
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.
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.
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/>. */
#include <arpa/inet.h>
/* We do not want to export __inet_aton_exact. Get the prototype and
change the visibility to hidden. */
#include <arpa/inet.h>
__typeof__ (__inet_aton_exact) __inet_aton_exact
__attribute__ ((visibility ("hidden")));
/* Do not provide definitions of the public symbols exported from
libc. */
#undef weak_alias
#define weak_alias(from, to)
#include <resolv/inet_addr.c>