generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Prevent potential stall on dns proxy operations."

Browse Source
This commit is contained in:
Selim Gurun 2012-03-07 17:05:15 -08:00 committed by Android (Google) Code Review
commit db6d20be77
2 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libc/netbsd/net/getaddrinfo.c
View File

@ -130,6 +130,9 @@ static const char in6_loopback[] = {
}; };
#endif #endif
// This should be synchronized to ResponseCode.h
static const int DnsProxyQueryResult = 222;
static const struct afd { static const struct afd {
int a_af; int a_af;
int a_addrlen; int a_addrlen;
@ -476,12 +479,15 @@ android_getaddrinfo_proxy(
goto exit; goto exit;
} }
int remote_rv; char buf[5];
if (fread(&remote_rv, sizeof(int), 1, proxy) != 1) { // read result code for gethostbyaddr
if (fread(buf, 1, sizeof(buf), proxy) != sizeof(buf)) {
goto exit; goto exit;
} }
if (remote_rv != 0) { int result_code = (int)strtol(buf, NULL, 10);
// verify the code itself
if (result_code != DnsProxyQueryResult ) {
goto exit; goto exit;
} }

36
libc/netbsd/net/getnameinfo.c
View File

@ -108,6 +108,10 @@ static int getnameinfo_link __P((const struct sockaddr *, socklen_t, char *,
socklen_t, char *, socklen_t, int)); socklen_t, char *, socklen_t, int));
static int hexname __P((const u_int8_t *, size_t, char *, socklen_t)); static int hexname __P((const u_int8_t *, size_t, char *, socklen_t));
// This should be synchronized to ResponseCode.h
static const int DnsProxyQueryResult = 222;
/* /*
* Top-level getnameinfo() code. Look at the address family, and pick an * Top-level getnameinfo() code. Look at the address family, and pick an
* appropriate function to call. * appropriate function to call.
@ -135,7 +139,7 @@ int getnameinfo(const struct sockaddr* sa, socklen_t salen, char* host, size_t h
* the address. On failure -1 is returned in which case * the address. On failure -1 is returned in which case
* normal execution flow shall continue. */ * normal execution flow shall continue. */
static int static int
android_gethostbyaddr_proxy(struct hostent* hp, const void *addr, socklen_t addrLen, int addrFamily) { android_gethostbyaddr_proxy(char* nameBuf, size_t nameBufLen, const void *addr, socklen_t addrLen, int addrFamily) {
int sock; int sock;
const int one = 1; const int one = 1;
@ -183,7 +187,7 @@ android_gethostbyaddr_proxy(struct hostent* hp, const void *addr, socklen_t addr
} }
char buf[INET6_ADDRSTRLEN]; // big enough for IPv4 and IPv6 char buf[INET6_ADDRSTRLEN]; // big enough for IPv4 and IPv6
const char* addrStr = inet_ntop(addrFamily, addr, &buf, sizeof(buf)); const char* addrStr = inet_ntop(addrFamily, addr, buf, sizeof(buf));
if (addrStr == NULL) { if (addrStr == NULL) {
goto exit; goto exit;
} }
@ -197,17 +201,29 @@ android_gethostbyaddr_proxy(struct hostent* hp, const void *addr, socklen_t addr
} }
result = 0; result = 0;
char msg_buf[5];
// read result code for gethostbyaddr
if (fread(msg_buf, 1, sizeof(msg_buf), proxy) != sizeof(msg_buf)) {
goto exit;
}
int result_code = (int)strtol(msg_buf, NULL, 10);
// verify the code itself
if (result_code != DnsProxyQueryResult) {
goto exit;
}
uint32_t name_len; uint32_t name_len;
if (fread(&name_len, sizeof(name_len), 1, proxy) != 1) { if (fread(&name_len, sizeof(name_len), 1, proxy) != 1) {
goto exit; goto exit;
} }
name_len = ntohl(name_len); name_len = ntohl(name_len);
if (name_len <= 0) { if (name_len <= 0 || name_len >= nameBufLen) {
goto exit; goto exit;
} }
if (fread(hp->h_name, name_len, 1, proxy) != 1) { if (fread(nameBuf, name_len, 1, proxy) != 1) {
goto exit; goto exit;
} }
@ -376,12 +392,14 @@ getnameinfo_inet(sa, salen, host, hostlen, serv, servlen, flags)
#ifdef ANDROID_CHANGES #ifdef ANDROID_CHANGES
struct hostent android_proxy_hostent; struct hostent android_proxy_hostent;
char android_proxy_buf[MAXDNAME]; char android_proxy_buf[MAXDNAME];
android_proxy_hostent.h_name = android_proxy_buf;
int hostnamelen = android_gethostbyaddr_proxy(&android_proxy_hostent, int hostnamelen = android_gethostbyaddr_proxy(android_proxy_buf,
addr, afd->a_addrlen, afd->a_af); MAXDNAME, addr, afd->a_addrlen, afd->a_af);
if (hostnamelen >= 0) { if (hostnamelen > 0) {
hp = (hostnamelen > 0) ? &android_proxy_hostent : NULL; hp = &android_proxy_hostent;
hp->h_name = android_proxy_buf;
} else if (!hostnamelen) {
hp = NULL;
} else { } else {
hp = gethostbyaddr(addr, afd->a_addrlen, afd->a_af); hp = gethostbyaddr(addr, afd->a_addrlen, afd->a_af);
} }