ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Merge branch 'XX-dont-fetch-keys-when-fuzzing-v9_11' into 'v9_11'

Browse Source 
Don't fetch DNSKEY when fuzzing resolver

See merge request isc-projects/bind9!347
This commit is contained in:
Witold Kręcicki
2018-06-06 15:28:09 +02:00
parent 8ca60f7099 9b17be187f
commit 4f3526f85c
2 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/dns/resolver.c
+7 -7
View File
@@ -544,9 +544,9 @@ struct dns_resolver {
#define NEGATIVE(r) (((r)->attributes & DNS_RDATASETATTR_NEGATIVE) != 0)
#ifdef ENABLE_AFL
static isc_boolean_t fuzzing_resolver = ISC_FALSE;
isc_boolean_t dns_fuzzing_resolver = ISC_FALSE;
void dns_resolver_setfuzzing() {
fuzzing_resolver = ISC_TRUE;
dns_fuzzing_resolver = ISC_TRUE;
}
#endif
@@ -1904,7 +1904,7 @@ add_bad_edns(fetchctx_t *fctx, isc_sockaddr_t *address) {
isc_sockaddr_t *sa;
#ifdef ENABLE_AFL
if (fuzzing_resolver)
if (dns_fuzzing_resolver)
return;
#endif
if (bad_edns(fctx, address))
@@ -2860,7 +2860,7 @@ mark_bad(fetchctx_t *fctx) {
isc_boolean_t all_bad = ISC_TRUE;
#ifdef ENABLE_AFL
if (fuzzing_resolver)
if (dns_fuzzing_resolver)
return ISC_FALSE;
#endif
@@ -2940,7 +2940,7 @@ add_bad(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo, isc_result_t reason,
isc_sockaddr_t *address = &addrinfo->sockaddr;
#ifdef ENABLE_AFL
if (fuzzing_resolver)
if (dns_fuzzing_resolver)
return;
#endif
@@ -8548,7 +8548,7 @@ resquery_response(isc_task_t *task, isc_event_t *event) {
no_response, ISC_FALSE);
#ifdef ENABLE_AFL
if (fuzzing_resolver && (keep_trying || resend)) {
if (dns_fuzzing_resolver && (keep_trying || resend)) {
fctx_done(fctx, DNS_R_SERVFAIL, __LINE__);
return;
} else
@@ -9787,7 +9787,7 @@ dns_resolver_addbadcache(dns_resolver_t *resolver, dns_name_t *name,
dns_rdatatype_t type, isc_time_t *expire)
{
#ifdef ENABLE_AFL
if (!fuzzing_resolver)
if (!dns_fuzzing_resolver)
#endif
{
(void) dns_badcache_add(resolver->badcache, name, type,
lib/dns/zone.c
+13
View File
@@ -187,6 +187,10 @@ typedef struct dns_include dns_include_t;
#define ZONEDB_UNLOCK(l, t) UNLOCK(l)
#endif
#ifdef ENABLE_AFL
extern isc_boolean_t dns_fuzzing_resolver;
#endif
struct dns_zone {
/* Unlocked */
unsigned int magic;
@@ -9825,6 +9829,10 @@ zone_refreshkeys(dns_zone_t *zone) {
* as the latter will have a lower trust level due to not being
* validated until keyfetch_done() is called.
*/
#ifdef ENABLE_AFL
if (dns_fuzzing_resolver == ISC_FALSE) {
#endif
result = dns_resolver_createfetch(zone->view->resolver,
kname, dns_rdatatype_dnskey,
NULL, NULL, NULL,
@@ -9836,6 +9844,11 @@ zone_refreshkeys(dns_zone_t *zone) {
&kfetch->dnskeyset,
&kfetch->dnskeysigset,
&kfetch->fetch);
#ifdef ENABLE_AFL
} else {
result = ISC_R_FAILURE;
}
#endif
if (result == ISC_R_SUCCESS)
fetching = ISC_TRUE;
else {