[master] avoid double-free in rrl

 - RRL could assert when freeing qname
 - also, changed test addresses from 192.168/16 to 192.0/16

diff --git a/bin/tests/system/rrl/ns2/tld2.db b/bin/tests/system/rrl/ns2/tld2.db
index 4059ce6c65700a6f56a39ea08f01ebf74a3eb6da..8b965814ad2b57431c1dff86eed420cbf5effea6 100644 (file)
--- a/bin/tests/system/rrl/ns2/tld2.db
+++ b/bin/tests/system/rrl/ns2/tld2.db
@@ -22,21 +22,21 @@ $TTL        120
                NS      .
 ns             A       10.53.0.2
 
-a1             A       192.168.2.1
+a1             A       192.0.2.1
 
-*.a2           A       192.168.2.2
+*.a2           A       192.0.2.2
 
 ; a3 is in tld3
 
 ; a4 does not exist to give NXDOMAIN
 
 ; a5 for TCP requests
-a5             A       192.168.2.5
+a5             A       192.0.2.5
 
 ; a6 for whitelisted clients
-a6             A       192.168.2.6
+a6             A       192.0.2.6
 
 ; a7 for SERVFAIL
 
 ; a8 for all-per-second limit
-$GENERATE 101-180 all$.a8 A 192.168.2.8
+$GENERATE 101-180 all$.a8 A 192.0.2.8

diff --git a/bin/tests/system/rrl/ns3/tld3.db b/bin/tests/system/rrl/ns3/tld3.db
index 23140ecb76bce6eef7343eec3e7fc44201eb86cf..f95fd2986f1d8be5c433910187e6dea14e161ea2 100644 (file)
--- a/bin/tests/system/rrl/ns3/tld3.db
+++ b/bin/tests/system/rrl/ns3/tld3.db
@@ -22,4 +22,4 @@ $TTL  120
                NS      .
 ns             A       10.53.0.3
 
-*.a3           A       192.168.3.3
+*.a3           A       192.0.3.3

diff --git a/bin/tests/system/rrl/tests.sh b/bin/tests/system/rrl/tests.sh
index fb238f6b195706de5e82c84ad10dc94a5e70aa44..5797889529b6a85c8e725b649f72a2d9fa4f92f4 100644 (file)
--- a/bin/tests/system/rrl/tests.sh
+++ b/bin/tests/system/rrl/tests.sh
@@ -156,11 +156,11 @@ burst 30 'x$CNT.a2.tld2'
 #                                      IP      TC      drop  NXDOMAIN SERVFAIL
 # check for 24 results
 # including the 1 second delay
-ck_result   a1.tld2    192.168.2.1     3       7       14      0       0
+ck_result   a1.tld2    192.0.2.1       3       7       14      0       0
 
 # Check the wild card answers.
 # The parent name of the 30 requests is counted.
-ck_result 'x*.a2.tld2' 192.168.2.2     2       10      18      0       0
+ck_result 'x*.a2.tld2' 192.0.2.2       2       10      18      0       0
 
 
 #########
@@ -173,7 +173,7 @@ burst 20 'z$CNT.a4.tld2'
 #   The first answer is counted separately because it is counted against
 #   the rate limit on recursing to the server for a3.tld3.  The remaining 20
 #   are counted as local responses from the cache.
-ck_result 'y*.a3.tld3' 192.168.3.3     3       6       12      0       0
+ck_result 'y*.a3.tld3' 192.0.3.3       3       6       12      0       0
 
 # NXDOMAIN responses are also limited based on the parent name.
 ck_result 'z*.a4.tld2' x               0       6       12      2       0
@@ -187,14 +187,14 @@ burst 20 a6.tld2 -b $ns7
 burst 20 a7.tld4
 
 # TCP responses are not rate limited
-ck_result a5.tld2      192.168.2.5     20      0       0       0       0
+ck_result a5.tld2      192.0.2.5       20      0       0       0       0
 
 # whitelisted client is not rate limited
-ck_result a6.tld2      192.168.2.6     20      0       0       0       0
+ck_result a6.tld2      192.0.2.6       20      0       0       0       0
 
 # Errors such as SERVFAIL are rate limited.  The numbers are confusing, because
 #   other rate limiting can be triggered before the SERVFAIL limit is reached.
-ck_result a7.tld4      192.168.2.1     0       6       12      0       2
+ck_result a7.tld4      192.0.2.1       0       6       12      0       2
 
 
 #########
@@ -204,7 +204,7 @@ sec_start
 #   The qnames are all unique but the client IP address is constant.
 CNT=101
 burst 80 'all$CNT.a8.tld2'
-ck_result 'a*.a8.tld2' 192.168.2.8     70      0       10      0       0
+ck_result 'a*.a8.tld2' 192.0.2.8       70      0       10      0       0
 
 
 $RNDC -c $SYSTEMTESTTOP/common/rndc.conf -p 9953 -s $ns2 stats

diff --git a/lib/dns/rrl.c b/lib/dns/rrl.c
index f5301648c57a98e6ede7817ecf2610f9d3ee6a0b..164d0c42026759b78f6c33ba7f74ebd09cb3772f 100644 (file)
--- a/lib/dns/rrl.c
+++ b/lib/dns/rrl.c
@@ -786,7 +786,8 @@ free_qname(dns_rrl_t *rrl, dns_rrl_entry_t *e) {
        qbuf = get_qname(rrl, e);
        if (qbuf != NULL) {
                qbuf->e = NULL;
-               ISC_LIST_APPEND(rrl->qname_free, qbuf, link);
+               if (!ISC_LINK_LINKED(qbuf, link))
+                       ISC_LIST_APPEND(rrl->qname_free, qbuf, link);
        }
 }