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

Don't pass pid to dnsproxyd

Browse Source 
dnsproxyd can already determine our pid by looking at our
socket connection. It's dangerous (and unneeded) to pass it
ourselves.

Change-Id: I2596d02e361b302259ddb084be2fb75be59889c5
This commit is contained in:
Nick Kralevich
2013-02-21 21:22:54 -08:00
parent 7dfc6a3cd1
commit bfe0640e41
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libc/netbsd/gethnamaddr.c
View File

@@ -756,8 +756,7 @@ gethostbyname_internal(const char *name, int af, res_state res, const char *ifac
/* This is writing to system/netd/DnsProxyListener.cpp and changes /* This is writing to system/netd/DnsProxyListener.cpp and changes
* here need to be matched there */ * here need to be matched there */
if (fprintf(proxy, "gethostbyname %d %s %s %d", if (fprintf(proxy, "gethostbyname %s %s %d",
getpid(),
iface == NULL ? "^" : iface, iface == NULL ? "^" : iface,
name == NULL ? "^" : name, name == NULL ? "^" : name,
af) < 0) { af) < 0) {
@@ -791,8 +790,8 @@ android_gethostbyaddrforiface_proxy(const void *addr,
const char * addrStr = inet_ntop(af, addr, buf, sizeof(buf)); const char * addrStr = inet_ntop(af, addr, buf, sizeof(buf));
if (addrStr == NULL) goto exit; if (addrStr == NULL) goto exit;
if (fprintf(proxy, "gethostbyaddr %s %d %d %d %s", if (fprintf(proxy, "gethostbyaddr %s %d %d %s",
addrStr, len, af, getpid(), iface == NULL ? "^" : iface) < 0) { addrStr, len, af, iface == NULL ? "^" : iface) < 0) {
goto exit; goto exit;
} }

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

@@ -446,15 +446,14 @@ android_getaddrinfo_proxy(
// Send the request. // Send the request.
proxy = fdopen(sock, "r+"); proxy = fdopen(sock, "r+");
if (fprintf(proxy, "getaddrinfo %s %s %d %d %d %d %s %d", if (fprintf(proxy, "getaddrinfo %s %s %d %d %d %d %s",
hostname == NULL ? "^" : hostname, hostname == NULL ? "^" : hostname,
servname == NULL ? "^" : servname, servname == NULL ? "^" : servname,
hints == NULL ? -1 : hints->ai_flags, hints == NULL ? -1 : hints->ai_flags,
hints == NULL ? -1 : hints->ai_family, hints == NULL ? -1 : hints->ai_family,
hints == NULL ? -1 : hints->ai_socktype, hints == NULL ? -1 : hints->ai_socktype,
hints == NULL ? -1 : hints->ai_protocol, hints == NULL ? -1 : hints->ai_protocol,
iface == NULL ? "^" : iface, iface == NULL ? "^" : iface) < 0) {
getpid()) < 0) {
goto exit; goto exit;
} }
// literal NULL byte at end, required by FrameworkListener // literal NULL byte at end, required by FrameworkListener