diff options
| author | Florian Weimer <fweimer@redhat.com> | 2016-03-29 12:57:56 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2016-03-29 12:57:56 +0200 |
| commit | 317b199b4aff8cfa27f2302ab404d2bb5032b9a4 (patch) | |
| tree | 2a1de65b3b7bc6d897db54edc1e2abeeac01407d | |
| parent | a6033052d08027f745867e5e346852da1959226c (diff) | |
| download | glibc-317b199b4aff8cfa27f2302ab404d2bb5032b9a4.tar.gz glibc-317b199b4aff8cfa27f2302ab404d2bb5032b9a4.tar.xz glibc-317b199b4aff8cfa27f2302ab404d2bb5032b9a4.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.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | resolv/nss_dns/dns-network.c | 5 |
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index ce6f8a2204..b620bbfcfa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2016-03-29 Florian Weimer <fweimer@redhat.com> + [BZ #19879] + CVE-2016-3075 + * resolv/nss_dns/dns-network.c (_nss_dns_getnetbyname_r): Do not + copy name. + +2016-03-29 Florian Weimer <fweimer@redhat.com> + [BZ #19837] * nss/nss_db/db-XXX.c (_nss_db_getENTNAME_r): Propagate ERANGE error if parse_line fails. diff --git a/resolv/nss_dns/dns-network.c b/resolv/nss_dns/dns-network.c index 2eb2f67e66..8f301a706b 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) { |