about summary refs log tree commit diff
path: root/inet/htontest.c
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2016-04-22 10:38:15 -0500
committerPaul E. Murphy <murphyp@linux.vnet.ibm.com>2016-04-22 14:53:46 -0500
commit715e7fe0322004fd2e3fed853e9be3c279f5015d (patch)
tree88bc1c2842d3cd104846c665af76af3f506c0b8f /inet/htontest.c
parent04130e53ba685dd7138e3e928708e17923f795b5 (diff)
downloadglibc-release/2.18/master.tar.gz
glibc-release/2.18/master.tar.xz
glibc-release/2.18/master.zip
resolv: Always set *resplen2 out parameter in send_dg [BZ #19791] release/2.18/master
Since commit 44d20bca52ace85850012b0ead37b360e3ecd96e (Implement
second fallback mode for DNS requests), there is a code path which
returns early, before *resplen2 is initialized.  This happens if the
name server address is immediately recognized as invalid (because of
lack of protocol support, or if it is a broadcast address such
255.255.255.255, or another invalid address).

If this happens and *resplen2 was non-zero (which is the case if a
previous query resulted in a failure), __libc_res_nquery would reuse
an existing second answer buffer.  This answer has been previously
identified as unusable (for example, it could be an NXDOMAIN
response).  Due to the presence of a second answer, no name server
switching will occur.  The result is a name resolution failure,
although a successful resolution would have been possible if name
servers have been switched and queries had proceeded along the search
path.

The above paragraph still simplifies the situation.  Before glibc
2.23, if the second answer needed malloc, the stub resolver would
still attempt to reuse the second answer, but this is not possible
because __libc_res_nsearch has freed it, after the unsuccessful call
to __libc_res_nquerydomain, and set the buffer pointer to NULL.  This
eventually leads to an assertion failure in __libc_res_nquery:

	/* Make sure both hp and hp2 are defined */
	assert((hp != NULL) && (hp2 != NULL));

If assertions are disabled, the consequence is a NULL pointer
dereference on the next line.

Starting with glibc 2.23, as a result of commit
e9db92d3acfe1822d56d11abcea5bfc4c41cf6ca (CVE-2015-7547: getaddrinfo()
stack-based buffer overflow (Bug 18665)), the second answer is always
allocated with malloc.  This means that the assertion failure happens
with small responses as well because there is no buffer to reuse, as
soon as there is a name resolution failure which triggers a search for
an answer along the search path.

This commit addresses the issue by ensuring that *resplen2 is
initialized before the send_dg function returns.

This commit also addresses a bug where an invalid second reply is
incorrectly returned as a valid to the caller.

(cherry picked from commit b66d837bb5398795c6b0f651bd5a5d66091d8577)
Diffstat (limited to 'inet/htontest.c')
0 files changed, 0 insertions, 0 deletions