qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Prepare inet_ntop to be fortified 

Rename inet_ntop to __inet_ntop and create the inet_ntop weak alias
based on it in order to prepare for disabling fortification when
available.

Reviewed-by: Florian Weimer <fweimer@redhat.com>
This commit is contained in:
Frédéric Bérat 2025-03-07 14:42:26 +01:00
parent c5113a838b
commit 84373ef7b7
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/arpa/inet.h
View File

@ -5,7 +5,9 @@
extern int __inet_aton_exact (const char *__cp, struct in_addr *__inp); extern int __inet_aton_exact (const char *__cp, struct in_addr *__inp);
libc_hidden_proto (__inet_aton_exact) libc_hidden_proto (__inet_aton_exact)
libc_hidden_proto (inet_ntop) extern __typeof (inet_ntop) __inet_ntop;
libc_hidden_proto (__inet_ntop)
libc_hidden_proto (inet_pton) libc_hidden_proto (inet_pton)
extern __typeof (inet_pton) __inet_pton; extern __typeof (inet_pton) __inet_pton;
libc_hidden_proto (__inet_pton) libc_hidden_proto (__inet_pton)

4
nss/getnameinfo.c
View File

@ -338,7 +338,7 @@ gni_host_inet_numeric (struct scratch_buffer *tmpbuf,
if (sa->sa_family == AF_INET6) if (sa->sa_family == AF_INET6)
{ {
const struct sockaddr_in6 *sin6p = (const struct sockaddr_in6 *) sa; const struct sockaddr_in6 *sin6p = (const struct sockaddr_in6 *) sa;
if (inet_ntop (AF_INET6, &sin6p->sin6_addr, host, hostlen) == NULL) if (__inet_ntop (AF_INET6, &sin6p->sin6_addr, host, hostlen) == NULL)
return EAI_OVERFLOW; return EAI_OVERFLOW;
uint32_t scopeid = sin6p->sin6_scope_id; uint32_t scopeid = sin6p->sin6_scope_id;
@ -365,7 +365,7 @@ gni_host_inet_numeric (struct scratch_buffer *tmpbuf,
else else
{ {
const struct sockaddr_in *sinp = (const struct sockaddr_in *) sa; const struct sockaddr_in *sinp = (const struct sockaddr_in *) sa;
if (inet_ntop (AF_INET, &sinp->sin_addr, host, hostlen) == NULL) if (__inet_ntop (AF_INET, &sinp->sin_addr, host, hostlen) == NULL)
return EAI_OVERFLOW; return EAI_OVERFLOW;
} }
return 0; return 0;

7
resolv/inet_ntop.c
View File

@ -42,7 +42,7 @@ static const char *inet_ntop4 (const u_char *src, char *dst, socklen_t size);
static const char *inet_ntop6 (const u_char *src, char *dst, socklen_t size); static const char *inet_ntop6 (const u_char *src, char *dst, socklen_t size);
/* char * /* char *
* inet_ntop(af, src, dst, size) * __inet_ntop(af, src, dst, size)
* convert a network format address to presentation format. * convert a network format address to presentation format.
* return: * return:
* pointer to presentation format address (`dst'), or NULL (see errno). * pointer to presentation format address (`dst'), or NULL (see errno).
@ -50,7 +50,7 @@ static const char *inet_ntop6 (const u_char *src, char *dst, socklen_t size);
* Paul Vixie, 1996. * Paul Vixie, 1996.
*/ */
const char * const char *
inet_ntop (int af, const void *src, char *dst, socklen_t size) __inet_ntop (int af, const void *src, char *dst, socklen_t size)
{ {
switch (af) { switch (af) {
case AF_INET: case AF_INET:
@ -63,7 +63,8 @@ inet_ntop (int af, const void *src, char *dst, socklen_t size)
} }
/* NOTREACHED */ /* NOTREACHED */
} }
libc_hidden_def (inet_ntop) libc_hidden_def (__inet_ntop)
weak_alias (__inet_ntop, inet_ntop)
/* const char * /* const char *
* inet_ntop4(src, dst, size) * inet_ntop4(src, dst, size)