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

* nis/nss_nis/nis-hosts.c (_nss_nis_gethostbyname4_r): Fix memory 

handling for host name aliases.
This commit is contained in:
Ulrich Drepper 2008-12-07 10:01:11 +00:00
parent f3721ab2dc
commit e87946cce5
2 changed files with 41 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2008-12-07 Ulrich Drepper <drepper@redhat.com>
* nis/nss_nis/nis-hosts.c (_nss_nis_gethostbyname4_r): Fix memory
handling for host name aliases.
2008-12-05 Ulrich Drepper <drepper@redhat.com> 2008-12-05 Ulrich Drepper <drepper@redhat.com>
* posix/globtest.sh: Use mktemp to create temporary file and * posix/globtest.sh: Use mktemp to create temporary file and

58
nis/nss_nis/nis-hosts.c
View File

@ -485,24 +485,6 @@ _nss_nis_gethostbyname4_r (const char *name, struct gaih_addrtuple **pat,
return retval; return retval;
} }
struct parser_data data;
struct hostent host;
int parse_res = parse_line (result, &host, &data, buflen, errnop, AF_UNSPEC,
0);
if (__builtin_expect (parse_res < 1, 0))
{
if (parse_res == -1)
{
*herrnop = NETDB_INTERNAL;
return NSS_STATUS_TRYAGAIN;
}
else
{
*herrnop = HOST_NOT_FOUND;
return NSS_STATUS_NOTFOUND;
}
}
if (*pat == NULL) if (*pat == NULL)
{ {
uintptr_t pad = (-(uintptr_t) buffer uintptr_t pad = (-(uintptr_t) buffer
@ -524,16 +506,48 @@ _nss_nis_gethostbyname4_r (const char *name, struct gaih_addrtuple **pat,
buflen -= sizeof (struct gaih_addrtuple); buflen -= sizeof (struct gaih_addrtuple);
} }
(*pat)->next = NULL; uintptr_t pad = -(uintptr_t) buffer % __alignof__ (struct parser_data);
size_t h_name_len = strlen (host.h_name); buffer += pad;
if (h_name_len >= buflen)
struct parser_data *data = (void *) buffer;
if (__builtin_expect (buflen < sizeof *data + 1 + pad, 0))
goto erange; goto erange;
(*pat)->name = memcpy (buffer, host.h_name, h_name_len + 1); buflen -= pad;
struct hostent host;
int parse_res = parse_line (result, &host, data, buflen, errnop, AF_UNSPEC,
0);
if (__builtin_expect (parse_res < 1, 0))
{
if (parse_res == -1)
{
*herrnop = NETDB_INTERNAL;
return NSS_STATUS_TRYAGAIN;
}
else
{
*herrnop = HOST_NOT_FOUND;
return NSS_STATUS_NOTFOUND;
}
}
(*pat)->next = NULL;
(*pat)->family = host.h_addrtype; (*pat)->family = host.h_addrtype;
memcpy ((*pat)->addr, host.h_addr_list[0], host.h_length); memcpy ((*pat)->addr, host.h_addr_list[0], host.h_length);
(*pat)->scopeid = 0; (*pat)->scopeid = 0;
assert (host.h_addr_list[1] == NULL); assert (host.h_addr_list[1] == NULL);
/* Undo the alignment for parser_data. */
buffer -= pad;
buflen += pad;
size_t h_name_len = strlen (host.h_name) + 1;
if (h_name_len >= buflen)
goto erange;
/* Potentially the string and the destination buffer overlap. */
(*pat)->name = memmove (buffer, host.h_name, h_name_len);
free (result); free (result);
return NSS_STATUS_SUCCESS; return NSS_STATUS_SUCCESS;