mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 14:07:59 +00:00
Code Issues Releases Wiki Activity

Merge branch '2332-fix-use-after-free-in-tcpdns_send_direct' into 'main'

Browse Source 
Don't use stack allocated buffer for uv_write()

Closes #2332

See merge request isc-projects/bind9!4465
This commit is contained in:
Ondřej Surý
2020-12-03 08:21:10 +00:00
parent aefe2b9958 94afea9325
commit d0f5407825
5 changed files with 3 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
bin/tests/system/ixfr/prereq.sh
View File

@@ -1,19 +0,0 @@
#!/bin/sh
#
# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, you can obtain one at https://mozilla.org/MPL/2.0/.
#
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
. ../conf.sh
if [ "$(uname -s)" != "Linux" ]; then
echo_i "This test is currently broken on non-Linux platforms"
exit 255
fi
exit 0

19
bin/tests/system/xfer/prereq.sh
View File

@@ -1,19 +0,0 @@
#!/bin/sh
#
# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, you can obtain one at https://mozilla.org/MPL/2.0/.
#
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
. ../conf.sh
if [ "$(uname -s)" != "Linux" ]; then
echo_i "This test is currently broken on non-Linux platforms"
exit 255
fi
exit 0

1
lib/isc/netmgr/netmgr-int.h
View File

@@ -287,6 +287,7 @@ struct isc__nm_uvreq {
int magic;
isc_nmsocket_t *sock;
isc_nmhandle_t *handle;
char tcplen[2]; /* The TCP DNS message length */
uv_buf_t uvbuf; /* translated isc_region_t, to be
* sent or received */
isc_sockaddr_t local; /* local address */

4
lib/isc/netmgr/tcpdns.c
View File

@@ -1238,6 +1238,7 @@ isc__nm_tcpdns_send(isc_nmhandle_t *handle, isc_region_t *region,
REQUIRE(sock->type == isc_nm_tcpdnssocket);
uvreq = isc__nm_uvreq_get(sock->mgr, sock);
*(uint16_t *)uvreq->tcplen = htons(region->length);
uvreq->uvbuf.base = (char *)region->base;
uvreq->uvbuf.len = region->length;
@@ -1300,8 +1301,7 @@ tcpdns_send_direct(isc_nmsocket_t *sock, isc__nm_uvreq_t *req) {
REQUIRE(sock->type == isc_nm_tcpdnssocket);
int r;
uint16_t len = htons(req->uvbuf.len);
uv_buf_t bufs[2] = { { .base = (char *)&len, .len = 2 },
uv_buf_t bufs[2] = { { .base = req->tcplen, .len = 2 },
{ .base = req->uvbuf.base,
.len = req->uvbuf.len } };

2
util/copyrights
View File

@@ -505,7 +505,6 @@
./bin/tests/system/ixfr/ans2/startme X 2011,2018,2019,2020
./bin/tests/system/ixfr/clean.sh SH 2001,2004,2007,2011,2012,2014,2015,2016,2018,2019,2020
./bin/tests/system/ixfr/ixfr-stats.good X 2019,2020
./bin/tests/system/ixfr/prereq.sh SH 2020
./bin/tests/system/ixfr/setup.sh SH 2001,2004,2007,2011,2012,2013,2014,2016,2018,2019,2020
./bin/tests/system/ixfr/tests.sh SH 2001,2004,2007,2011,2012,2014,2016,2018,2019,2020
./bin/tests/system/kasp/README TXT.BRIEF 2019,2020
@@ -962,7 +961,6 @@
./bin/tests/system/xfer/dig2.good X 2000,2001,2003,2004,2009,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020
./bin/tests/system/xfer/knowngood.mapped X 2016,2018,2019,2020
./bin/tests/system/xfer/ns4/named.conf.base X 2011,2013,2016,2018,2019,2020
./bin/tests/system/xfer/prereq.sh SH 2020
./bin/tests/system/xfer/setup.sh SH 2001,2002,2004,2007,2011,2012,2013,2014,2015,2016,2018,2019,2020
./bin/tests/system/xfer/tests.sh SH 2000,2001,2004,2005,2007,2011,2012,2013,2014,2015,2016,2018,2019,2020
./bin/tests/system/xferquota/clean.sh SH 2000,2001,2004,2007,2012,2014,2015,2016,2018,2019,2020