mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-29 08:11:08 +00:00
6a1cefac19
Bug 16458 reports that the endian-conversion macros in <endian.h> and
<netinet/in.h>, in the case where no endian conversion is needed, just
return their arguments without converting to the expected return type,
so failing to act as expected for a macro version of a function. (The
<netinet/in.h> macros, in particular, are described with prototypes in
POSIX so should act like correspondingly prototyped functions.)
Where previously this was a fairly obscure issue, it now results in
glibc build with GCC mainline breaking for big-endian systems:
nss_hesiod/hesiod-service.c: In function '_nss_hesiod_getservbyport_r':
nss_hesiod/hesiod-service.c:142:39: error: '%d' directive output may be truncated writing between 1 and 11 bytes into a region of size 6 [-Werror=format-truncation=]
snprintf (portstr, sizeof portstr, "%d", ntohs (port));
^~
nss_hesiod/hesiod-service.c:142:38: note: using the range [1, -2147483648] for directive argument
snprintf (portstr, sizeof portstr, "%d", ntohs (port));
^~~~
nss_hesiod/hesiod-service.c:142:3: note: format output between 2 and 12 bytes into a destination of size 6
snprintf (portstr, sizeof portstr, "%d", ntohs (port));
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The port argument is passed as int to this function, so when ntohs
does not convert the compiler cannot tell that the result is within
the range of uint16_t. (I don't know if in fact it's possible for
out-of-range values to reach this function and so get truncated as
strings without this patch or as integers with it.)
This patch arranges for these macros to use identity functions to
ensure appropriate conversions while having warnings for implicit
conversions of function arguments that might not occur with a cast.
Tested for x86_64 and x86; with build-many-glibcs.py with GCC 6; and
with build-many-glibcs.py with GCC mainline for powerpc to test the
build fix.
[BZ #16458]
* bits/uintn-identity.h: New file.
* inet/netinet/in.h: Include <bits/uintn-identity.h>.
[__BYTE_ORDER == __BIG_ENDIAN] (ntohl): Use __uint32_identity.
[__BYTE_ORDER == __BIG_ENDIAN] (ntohs): Use __uint16_identity.
[__BYTE_ORDER == __BIG_ENDIAN] (htonl): Use __uint32_identity.
[__BYTE_ORDER == __BIG_ENDIAN] (htohs): Use __uint16_identity.
* string/endian.h: Include <bits/uintn-identity.h>.
[__BYTE_ORDER == __LITTLE_ENDIAN] (htole16): Use
__uint16_identity.
[__BYTE_ORDER == __LITTLE_ENDIAN] (le16toh): Likewise.
[__BYTE_ORDER == __LITTLE_ENDIAN] (htole32): Use
__uint32_identity.
[__BYTE_ORDER == __LITTLE_ENDIAN] (le32toh): Likewise.
[__BYTE_ORDER == __LITTLE_ENDIAN] (htole64): Use
__uint64_identity.
[__BYTE_ORDER == __LITTLE_ENDIAN] (le64toh): Likewise.
[__BYTE_ORDER != __LITTLE_ENDIAN] (htobe16): Use
__uint16_identity.
[__BYTE_ORDER != __LITTLE_ENDIAN] (be16toh): Likewise.
[__BYTE_ORDER != __LITTLE_ENDIAN] (htobe32): Use
__uint32_identity.
[__BYTE_ORDER != __LITTLE_ENDIAN] (be32toh): Likewise.
[__BYTE_ORDER != __LITTLE_ENDIAN] (htobe64): Use
__uint64_identity.
[__BYTE_ORDER != __LITTLE_ENDIAN] (be64toh): Likewise.
* string/Makefile (headers): Add bits/uintn-identity.h.
(tests): Add test-endian-types.
* string/test-endian-types.c: New file.
* inet/Makefile (tests): Add test-hnto-types.
* inet/test-hnto-types.c: New file.
97 lines
3.3 KiB
Makefile
97 lines
3.3 KiB
Makefile
# Copyright (C) 1991-2017 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/>.
|
|
|
|
#
|
|
# Sub-makefile for inet portion of the library.
|
|
#
|
|
subdir := inet
|
|
|
|
include ../Makeconfig
|
|
|
|
headers := netinet/ether.h netinet/in.h netinet/in_systm.h \
|
|
netinet/if_ether.h netinet/igmp.h \
|
|
netinet/tcp.h netinet/ip.h $(wildcard arpa/*.h protocols/*.h) \
|
|
aliases.h ifaddrs.h netinet/ip6.h netinet/icmp6.h bits/in.h
|
|
|
|
routines := htonl htons \
|
|
inet_lnaof inet_mkadr \
|
|
inet_netof inet_ntoa inet_net herrno herrno-loc \
|
|
gethstbyad gethstbyad_r gethstbynm gethstbynm2 gethstbynm2_r \
|
|
gethstbynm_r gethstent gethstent_r \
|
|
getnetbyad getnetbyad_r getnetbynm getnetent getnetent_r \
|
|
getnetbynm_r \
|
|
getproto getproto_r getprtent getprtent_r getprtname getprtname_r \
|
|
getsrvbynm getsrvbynm_r getsrvbypt getsrvbypt_r getservent \
|
|
getservent_r \
|
|
ether_aton ether_aton_r ether_hton ether_line \
|
|
ether_ntoa ether_ntoa_r ether_ntoh \
|
|
rcmd rexec ruserpass \
|
|
getnetgrent_r getnetgrent \
|
|
getaliasent_r getaliasent getaliasname getaliasname_r \
|
|
in6_addr getnameinfo if_index ifaddrs inet6_option \
|
|
getipv4sourcefilter setipv4sourcefilter \
|
|
getsourcefilter setsourcefilter inet6_opt inet6_rth \
|
|
inet6_scopeid_pton
|
|
|
|
aux := check_pf check_native ifreq
|
|
|
|
tests := htontest test_ifindex tst-ntoa tst-ether_aton tst-network \
|
|
tst-gethnm test-ifaddrs bug-if1 test-inet6_opt tst-ether_line \
|
|
tst-getni1 tst-getni2 tst-inet6_rth tst-checks tst-checks-posix \
|
|
tst-sockaddr tst-inet6_scopeid_pton test-hnto-types
|
|
|
|
include ../Rules
|
|
|
|
ifeq ($(have-thread-library),yes)
|
|
|
|
CFLAGS-gethstbyad_r.c = -fexceptions
|
|
CFLAGS-gethstbyad.c = -fexceptions
|
|
CFLAGS-gethstbynm_r.c = -fexceptions
|
|
CFLAGS-gethstbynm.c = -fexceptions
|
|
CFLAGS-gethstbynm2_r.c = -fexceptions
|
|
CFLAGS-gethstbynm2.c = -fexceptions
|
|
CFLAGS-gethstent_r.c = -fexceptions
|
|
CFLAGS-gethstent.c = -fexceptions
|
|
CFLAGS-rcmd.c = -fexceptions
|
|
CFLAGS-getnetbynm_r.c = -fexceptions
|
|
CFLAGS-getnetbynm.c = -fexceptions
|
|
CFLAGS-getnetbyad_r.c = -fexceptions
|
|
CFLAGS-getnetbyad.c = -fexceptions
|
|
CFLAGS-getnetent_r.c = -fexceptions
|
|
CFLAGS-getnetent.c = -fexceptions
|
|
CFLAGS-getaliasent_r.c = -fexceptions
|
|
CFLAGS-getaliasent.c = -fexceptions
|
|
CFLAGS-getrpcent_r.c = -fexceptions
|
|
CFLAGS-getrpcent.c = -fexceptions
|
|
CFLAGS-getservent_r.c = -fexceptions
|
|
CFLAGS-getservent.c = -fexceptions
|
|
CFLAGS-getprtent_r.c = -fexceptions
|
|
CFLAGS-getprtent.c = -fexceptions
|
|
CFLAGS-either_ntoh.c = -fexceptions
|
|
CFLAGS-either_hton.c = -fexceptions
|
|
CFLAGS-getnetgrent.c = -fexceptions
|
|
CFLAGS-getnetgrent_r.c = -fexceptions
|
|
|
|
CFLAGS-tst-checks-posix.c = -std=c99
|
|
CFLAGS-tst-sockaddr.c = -fno-strict-aliasing
|
|
|
|
endif
|
|
|
|
ifeq ($(build-static-nss),yes)
|
|
CFLAGS += -DSTATIC_NSS
|
|
endif
|