upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-11 15:30:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '983-delv-www-isc-org-any-rtrace-multiline-leaks-memory-v9_14' into 'v9_14'

Browse source 
Resolve "'delv www.isc.org ANY +rtrace +multiline' leaks memory"

See merge request isc-projects/bind9!1896
This commit is contained in:
Mark Andrews 2019-05-06 20:39:34 -04:00
commit b01ebf8168
3 changed files with 31 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGES
View file

@ -1,3 +1,5 @@
5222. [bug] 'delve -t ANY' could leak memory. [GL #983]
5221. [test] Enable parallel execution of system tests on
Windows. [GL !4101]

14
bin/tests/system/digdelv/tests.sh
View file

@ -55,7 +55,7 @@ check_ttl_range() {
# using delv insecure mode as not testing dnssec here
delv_with_opts() {
"$DELV" -i -p "$PORT" "$@"
"$DELV" +noroot +nodlv -p "$PORT" "$@"
}
KEYID="$(cat ns2/keyid)"
@ -852,13 +852,23 @@ if [ -x "$DELV" ] ; then
n=$((n+1))
echo_i "check that delv -q -m works ($n)"
ret=0
delv_with_opts @10.53.0.3 -q -m > delv.out.test$n 2>&1
delv_with_opts @10.53.0.3 -q -m > delv.out.test$n 2>&1 || ret=1
grep '^; -m\..*[0-9]*.*IN.*ANY.*;' delv.out.test$n > /dev/null || ret=1
grep "^add " delv.out.test$n > /dev/null && ret=1
grep "^del " delv.out.test$n > /dev/null && ret=1
check_ttl_range delv.out.test$n '\\-ANY' 300 3 || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
n=$((n+1))
echo_i "check that delv -t ANY works ($n)"
ret=0
delv_with_opts @10.53.0.3 -t ANY example > delv.out.test$n 2>&1 || ret=1
grep "^example." < delv.out.test$n > /dev/null || ret=1
check_ttl_range delv.out.test$n NS 300 || ret=1
check_ttl_range delv.out.test$n SOA 300 || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret))
else
echo_i "$DELV is needed, so skipping these delv tests"
fi

28
lib/dns/client.c
View file

@ -123,10 +123,10 @@ typedef struct resctx {
unsigned int magic;
isc_mutex_t lock;
dns_client_t *client;
bool want_dnssec;
bool want_validation;
bool want_cdflag;
bool want_tcp;
bool want_dnssec;
bool want_validation;
bool want_cdflag;
bool want_tcp;
/* Locked */
ISC_LINK(struct resctx) link;
@ -139,7 +139,7 @@ typedef struct resctx {
dns_namelist_t namelist;
isc_result_t result;
dns_clientresevent_t *event;
bool canceled;
bool canceled;
dns_rdataset_t *rdataset;
dns_rdataset_t *sigrdataset;
} resctx_t;
@ -158,7 +158,7 @@ typedef struct resarg {
isc_result_t vresult;
dns_namelist_t *namelist;
dns_clientrestrans_t *trans;
bool canceled;
bool canceled;
} resarg_t;
/*%
@ -173,7 +173,7 @@ typedef struct reqctx {
/* Locked */
ISC_LINK(struct reqctx) link;
bool canceled;
bool canceled;
dns_tsigkey_t *tsigkey;
dns_request_t *request;
dns_clientreqevent_t *event;
@ -191,7 +191,7 @@ typedef struct reqarg {
/* Locked */
isc_result_t result;
dns_clientreqtrans_t *trans;
bool canceled;
bool canceled;
} reqarg_t;
/*%
@ -206,7 +206,7 @@ typedef struct updatearg {
/* Locked */
isc_result_t result;
dns_clientupdatetrans_t *trans;
bool canceled;
bool canceled;
} updatearg_t;
/*%
@ -217,14 +217,14 @@ typedef struct updatectx {
unsigned int magic;
isc_mutex_t lock;
dns_client_t *client;
bool want_tcp;
bool want_tcp;
/* Locked */
dns_request_t *updatereq;
dns_request_t *soareq;
dns_clientrestrans_t *restrans;
dns_clientrestrans_t *restrans2;
bool canceled;
bool canceled;
/* Task Locked */
ISC_LINK(struct updatectx) link;
@ -1096,6 +1096,12 @@ client_resfind(resctx_t *rctx, dns_fetchevent_t *event) {
}
}
}
if (rctx->rdataset != NULL) {
putrdataset(mctx, &rctx->rdataset);
}
if (rctx->sigrdataset != NULL) {
putrdataset(mctx, &rctx->sigrdataset);
}
if (n == 0) {
/*
* We didn't match any rdatasets (which means