about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2016-03-29 12:57:56 +0200
committerMike Frysinger <vapier@gentoo.org>2016-04-04 14:57:53 -0400
commit1199943f072f8a0c47d9283bc9d8c1740a38a94e (patch)
treecacae5e11eaa1e76f43f0ee628e4a8d4d160477a
parentb286c83dcbd06314859bf86319782611c81e283d (diff)
downloadglibc-1199943f072f8a0c47d9283bc9d8c1740a38a94e.tar.gz
glibc-1199943f072f8a0c47d9283bc9d8c1740a38a94e.tar.xz
glibc-1199943f072f8a0c47d9283bc9d8c1740a38a94e.zip
CVE-2016-3075: Stack overflow in _nss_dns_getnetbyname_r [BZ #19879]
The defensive copy is not needed because the name may not alias the
output buffer.

(cherry picked from commit 317b199b4aff8cfa27f2302ab404d2bb5032b9a4)
(cherry picked from commit 883dceebc8f11921a9890211a4e202e5be17562f)
-rw-r--r--resolv/nss_dns/dns-network.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/resolv/nss_dns/dns-network.c b/resolv/nss_dns/dns-network.c
index 00f4490c5d..89f8783fbe 100644
--- a/resolv/nss_dns/dns-network.c
+++ b/resolv/nss_dns/dns-network.c
@@ -118,17 +118,14 @@ _nss_dns_getnetbyname_r (const char *name, struct netent *result,
   } net_buffer;
   querybuf *orig_net_buffer;
   int anslen;
-  char *qbuf;
   enum nss_status status;
 
   if (__res_maybe_init (&_res, 0) == -1)
     return NSS_STATUS_UNAVAIL;
 
-  qbuf = strdupa (name);
-
   net_buffer.buf = orig_net_buffer = (querybuf *) alloca (1024);
 
-  anslen = __libc_res_nsearch (&_res, qbuf, C_IN, T_PTR, net_buffer.buf->buf,
+  anslen = __libc_res_nsearch (&_res, name, C_IN, T_PTR, net_buffer.buf->buf,
 			       1024, &net_buffer.ptr, NULL, NULL, NULL, NULL);
   if (anslen < 0)
     {