getnameinfo: Refactor and fix memory leak [BZ #19642]
Split getnameinfo into separate functions for host and service lookups, and for different address families.
This commit is contained in:
Florian Weimer
parent
72c11b353e
commit
2dce81a319
10
ChangeLog
10
ChangeLog
@ -1,3 +1,13 @@
|
||||
2016-04-29 Florian Weimer <fweimer@redhat.com>
|
||||
|
||||
[BZ #19642]
|
||||
* inet/getnameinfo.c (gni_host_inet_name, gni_host_inet_numeric)
|
||||
(gni_host_inet, gni_host_local, gni_host, gni_serv_inet)
|
||||
(gni_serv_local, gni_serv): New functions extracted from
|
||||
getnameinfo.
|
||||
(getnameinfo): Call gni_host and gni_serv to perform the
|
||||
processing. Always free scratch buffer.
|
||||
|
||||
2016-04-29 Gabriel F. T. Gomes <gftg@linux.vnet.ibm.com>
|
||||
|
||||
* sysdeps/powerpc/powerpc64/power8/strncpy.S: Call memset to pad the
|
||||
|
||||
@ -1,3 +1,21 @@
|
||||
/* Convert socket address to string using Name Service Switch modules.
|
||||
Copyright (C) 1997-2016 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/>. */
|
||||
|
||||
/* The Inner Net License, Version 2.00
|
||||
|
||||
The author(s) grant permission for redistribution and use in source and
|
||||
@ -169,68 +187,25 @@ nrl_domainname (void)
|
||||
return domain;
|
||||
};
|
||||
|
||||
|
||||
int
|
||||
getnameinfo (const struct sockaddr *sa, socklen_t addrlen, char *host,
|
||||
socklen_t hostlen, char *serv, socklen_t servlen,
|
||||
int flags)
|
||||
/* Convert host name, AF_INET/AF_INET6 case, name only. */
|
||||
static int
|
||||
gni_host_inet_name (struct scratch_buffer *tmpbuf,
|
||||
const struct sockaddr *sa, socklen_t addrlen,
|
||||
char *host, socklen_t hostlen, int flags)
|
||||
{
|
||||
int herrno;
|
||||
struct hostent th;
|
||||
int ok = 0;
|
||||
struct scratch_buffer tmpbuf;
|
||||
|
||||
scratch_buffer_init (&tmpbuf);
|
||||
|
||||
if (flags & ~(NI_NUMERICHOST|NI_NUMERICSERV|NI_NOFQDN|NI_NAMEREQD|NI_DGRAM
|
||||
#ifdef HAVE_LIBIDN
|
||||
|NI_IDN|NI_IDN_ALLOW_UNASSIGNED|NI_IDN_USE_STD3_ASCII_RULES
|
||||
#endif
|
||||
))
|
||||
return EAI_BADFLAGS;
|
||||
|
||||
if (sa == NULL || addrlen < sizeof (sa_family_t))
|
||||
return EAI_FAMILY;
|
||||
|
||||
if ((flags & NI_NAMEREQD) && host == NULL && serv == NULL)
|
||||
return EAI_NONAME;
|
||||
|
||||
switch (sa->sa_family)
|
||||
{
|
||||
case AF_LOCAL:
|
||||
if (addrlen < (socklen_t) offsetof (struct sockaddr_un, sun_path))
|
||||
return EAI_FAMILY;
|
||||
break;
|
||||
case AF_INET:
|
||||
if (addrlen < sizeof (struct sockaddr_in))
|
||||
return EAI_FAMILY;
|
||||
break;
|
||||
case AF_INET6:
|
||||
if (addrlen < sizeof (struct sockaddr_in6))
|
||||
return EAI_FAMILY;
|
||||
break;
|
||||
default:
|
||||
return EAI_FAMILY;
|
||||
}
|
||||
|
||||
if (host != NULL && hostlen > 0)
|
||||
switch (sa->sa_family)
|
||||
{
|
||||
case AF_INET:
|
||||
case AF_INET6:
|
||||
if (!(flags & NI_NUMERICHOST))
|
||||
{
|
||||
struct hostent *h = NULL;
|
||||
if (sa->sa_family == AF_INET6)
|
||||
{
|
||||
while (__gethostbyaddr_r ((const void *) &(((const struct sockaddr_in6 *) sa)->sin6_addr),
|
||||
sizeof(struct in6_addr),
|
||||
AF_INET6, &th,
|
||||
tmpbuf.data, tmpbuf.length,
|
||||
tmpbuf->data, tmpbuf->length,
|
||||
&h, &herrno))
|
||||
if (herrno == NETDB_INTERNAL && errno == ERANGE)
|
||||
{
|
||||
if (!scratch_buffer_grow (&tmpbuf))
|
||||
if (!scratch_buffer_grow (tmpbuf))
|
||||
{
|
||||
__set_h_errno (herrno);
|
||||
return EAI_MEMORY;
|
||||
@ -244,11 +219,11 @@ getnameinfo (const struct sockaddr *sa, socklen_t addrlen, char *host,
|
||||
while (__gethostbyaddr_r ((const void *) &(((const struct sockaddr_in *)sa)->sin_addr),
|
||||
sizeof(struct in_addr),
|
||||
AF_INET, &th,
|
||||
tmpbuf.data, tmpbuf.length,
|
||||
tmpbuf->data, tmpbuf->length,
|
||||
&h, &herrno))
|
||||
if (herrno == NETDB_INTERNAL && errno == ERANGE)
|
||||
{
|
||||
if (!scratch_buffer_grow (&tmpbuf))
|
||||
if (!scratch_buffer_grow (tmpbuf))
|
||||
{
|
||||
__set_h_errno (herrno);
|
||||
return EAI_MEMORY;
|
||||
@ -318,16 +293,18 @@ getnameinfo (const struct sockaddr *sa, socklen_t addrlen, char *host,
|
||||
|
||||
memcpy (host, h->h_name, len);
|
||||
|
||||
ok = 1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (!ok)
|
||||
{
|
||||
if (flags & NI_NAMEREQD)
|
||||
return EAI_NONAME;
|
||||
else
|
||||
{
|
||||
}
|
||||
|
||||
/* Convert host name, AF_INET/AF_INET6 case, numeric conversion. */
|
||||
static int
|
||||
gni_host_inet_numeric (struct scratch_buffer *tmpbuf,
|
||||
const struct sockaddr *sa, socklen_t addrlen,
|
||||
char *host, socklen_t hostlen, int flags)
|
||||
{
|
||||
const char *c;
|
||||
if (sa->sa_family == AF_INET6)
|
||||
{
|
||||
@ -384,12 +361,35 @@ getnameinfo (const struct sockaddr *sa, socklen_t addrlen, char *host,
|
||||
host, hostlen);
|
||||
if (c == NULL)
|
||||
return EAI_OVERFLOW;
|
||||
}
|
||||
ok = 1;
|
||||
}
|
||||
break;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
gni_host_inet (struct scratch_buffer *tmpbuf,
|
||||
const struct sockaddr *sa, socklen_t addrlen,
|
||||
char *host, socklen_t hostlen, int flags)
|
||||
{
|
||||
if (!(flags & NI_NUMERICHOST))
|
||||
{
|
||||
int result = gni_host_inet_name
|
||||
(tmpbuf, sa, addrlen, host, hostlen, flags);
|
||||
if (result != EAI_NONAME)
|
||||
return result;
|
||||
}
|
||||
|
||||
if (flags & NI_NAMEREQD)
|
||||
return EAI_NONAME;
|
||||
else
|
||||
return gni_host_inet_numeric
|
||||
(tmpbuf, sa, addrlen, host, hostlen, flags);
|
||||
}
|
||||
|
||||
static int
|
||||
gni_host_local (struct scratch_buffer *tmpbuf,
|
||||
const struct sockaddr *sa, socklen_t addrlen,
|
||||
char *host, socklen_t hostlen, int flags)
|
||||
{
|
||||
|
||||
case AF_LOCAL:
|
||||
if (!(flags & NI_NUMERICHOST))
|
||||
{
|
||||
struct utsname utsname;
|
||||
@ -397,25 +397,48 @@ getnameinfo (const struct sockaddr *sa, socklen_t addrlen, char *host,
|
||||
if (!uname (&utsname))
|
||||
{
|
||||
strncpy (host, utsname.nodename, hostlen);
|
||||
break;
|
||||
};
|
||||
};
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
if (flags & NI_NAMEREQD)
|
||||
return EAI_NONAME;
|
||||
|
||||
strncpy (host, "localhost", hostlen);
|
||||
break;
|
||||
return 0;
|
||||
}
|
||||
|
||||
default:
|
||||
return EAI_FAMILY;
|
||||
}
|
||||
|
||||
if (serv && (servlen > 0))
|
||||
static int
|
||||
gni_host (struct scratch_buffer *tmpbuf,
|
||||
const struct sockaddr *sa, socklen_t addrlen,
|
||||
char *host, socklen_t hostlen, int flags)
|
||||
{
|
||||
switch (sa->sa_family)
|
||||
{
|
||||
case AF_INET:
|
||||
case AF_INET6:
|
||||
return gni_host_inet (tmpbuf, sa, addrlen, host, hostlen, flags);
|
||||
|
||||
case AF_LOCAL:
|
||||
return gni_host_local (tmpbuf, sa, addrlen, host, hostlen, flags);
|
||||
|
||||
default:
|
||||
return EAI_FAMILY;
|
||||
}
|
||||
}
|
||||
|
||||
/* Convert service to string, AF_INET and AF_INET6 variant. */
|
||||
static int
|
||||
gni_serv_inet (struct scratch_buffer *tmpbuf,
|
||||
const struct sockaddr *sa, socklen_t addrlen,
|
||||
char *serv, socklen_t servlen, int flags)
|
||||
{
|
||||
_Static_assert
|
||||
(offsetof (struct sockaddr_in, sin_port)
|
||||
== offsetof (struct sockaddr_in6, sin6_port)
|
||||
&& sizeof (((struct sockaddr_in) {}).sin_port) == sizeof (in_port_t)
|
||||
&& sizeof (((struct sockaddr_in6) {}).sin6_port) == sizeof (in_port_t),
|
||||
"AF_INET and AF_INET6 port consistency");
|
||||
if (!(flags & NI_NUMERICSERV))
|
||||
{
|
||||
struct servent *s, ts;
|
||||
@ -423,11 +446,11 @@ getnameinfo (const struct sockaddr *sa, socklen_t addrlen, char *host,
|
||||
while ((e = __getservbyport_r (((const struct sockaddr_in *) sa)->sin_port,
|
||||
((flags & NI_DGRAM)
|
||||
? "udp" : "tcp"), &ts,
|
||||
tmpbuf.data, tmpbuf.length, &s)))
|
||||
tmpbuf->data, tmpbuf->length, &s)))
|
||||
{
|
||||
if (e == ERANGE)
|
||||
{
|
||||
if (!scratch_buffer_grow (&tmpbuf))
|
||||
if (!scratch_buffer_grow (tmpbuf))
|
||||
return EAI_MEMORY;
|
||||
}
|
||||
else
|
||||
@ -436,26 +459,110 @@ getnameinfo (const struct sockaddr *sa, socklen_t addrlen, char *host,
|
||||
if (s)
|
||||
{
|
||||
strncpy (serv, s->s_name, servlen);
|
||||
break;
|
||||
return 0;
|
||||
}
|
||||
/* Fall through to numeric conversion. */
|
||||
}
|
||||
|
||||
if (__snprintf (serv, servlen, "%d",
|
||||
ntohs (((const struct sockaddr_in *) sa)->sin_port))
|
||||
+ 1 > servlen)
|
||||
return EAI_OVERFLOW;
|
||||
return 0;
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case AF_LOCAL:
|
||||
/* Convert service to string, AF_LOCAL variant. */
|
||||
static int
|
||||
gni_serv_local (struct scratch_buffer *tmpbuf,
|
||||
const struct sockaddr *sa, socklen_t addrlen,
|
||||
char *serv, socklen_t servlen, int flags)
|
||||
{
|
||||
strncpy (serv, ((const struct sockaddr_un *) sa)->sun_path, servlen);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Convert service to string, dispatching to the implementations
|
||||
above. */
|
||||
static int
|
||||
gni_serv (struct scratch_buffer *tmpbuf,
|
||||
const struct sockaddr *sa, socklen_t addrlen,
|
||||
char *serv, socklen_t servlen, int flags)
|
||||
{
|
||||
switch (sa->sa_family)
|
||||
{
|
||||
case AF_INET:
|
||||
case AF_INET6:
|
||||
return gni_serv_inet (tmpbuf, sa, addrlen, serv, servlen, flags);
|
||||
case AF_LOCAL:
|
||||
return gni_serv_local (tmpbuf, sa, addrlen, serv, servlen, flags);
|
||||
default:
|
||||
return EAI_FAMILY;
|
||||
}
|
||||
}
|
||||
|
||||
int
|
||||
getnameinfo (const struct sockaddr *sa, socklen_t addrlen, char *host,
|
||||
socklen_t hostlen, char *serv, socklen_t servlen,
|
||||
int flags)
|
||||
{
|
||||
if (flags & ~(NI_NUMERICHOST|NI_NUMERICSERV|NI_NOFQDN|NI_NAMEREQD|NI_DGRAM
|
||||
#ifdef HAVE_LIBIDN
|
||||
|NI_IDN|NI_IDN_ALLOW_UNASSIGNED|NI_IDN_USE_STD3_ASCII_RULES
|
||||
#endif
|
||||
))
|
||||
return EAI_BADFLAGS;
|
||||
|
||||
if (sa == NULL || addrlen < sizeof (sa_family_t))
|
||||
return EAI_FAMILY;
|
||||
|
||||
if ((flags & NI_NAMEREQD) && host == NULL && serv == NULL)
|
||||
return EAI_NONAME;
|
||||
|
||||
switch (sa->sa_family)
|
||||
{
|
||||
case AF_LOCAL:
|
||||
if (addrlen < (socklen_t) offsetof (struct sockaddr_un, sun_path))
|
||||
return EAI_FAMILY;
|
||||
break;
|
||||
case AF_INET:
|
||||
if (addrlen < sizeof (struct sockaddr_in))
|
||||
return EAI_FAMILY;
|
||||
break;
|
||||
case AF_INET6:
|
||||
if (addrlen < sizeof (struct sockaddr_in6))
|
||||
return EAI_FAMILY;
|
||||
break;
|
||||
default:
|
||||
return EAI_FAMILY;
|
||||
}
|
||||
|
||||
struct scratch_buffer tmpbuf;
|
||||
scratch_buffer_init (&tmpbuf);
|
||||
|
||||
if (host != NULL && hostlen > 0)
|
||||
{
|
||||
int result = gni_host (&tmpbuf, sa, addrlen, host, hostlen, flags);
|
||||
if (result != 0)
|
||||
{
|
||||
scratch_buffer_free (&tmpbuf);
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
if (serv && (servlen > 0))
|
||||
{
|
||||
int result = gni_serv (&tmpbuf, sa, addrlen, serv, servlen, flags);
|
||||
if (result != 0)
|
||||
{
|
||||
scratch_buffer_free (&tmpbuf);
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
if (host && (hostlen > 0))
|
||||
host[hostlen-1] = 0;
|
||||
if (serv && (servlen > 0))
|
||||
serv[servlen-1] = 0;
|
||||
scratch_buffer_free (&tmpbuf);
|
||||
return 0;
|
||||
}
|
||||
libc_hidden_def (getnameinfo)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user