diff options
author | Simon L. B. Nielsen <simon@FreeBSD.org> | 2012-08-06 21:33:11 +0000 |
---|---|---|
committer | Simon L. B. Nielsen <simon@FreeBSD.org> | 2012-08-06 21:33:11 +0000 |
commit | e39869bfb92f16f23b6f271a0ba8a46a23020518 (patch) | |
tree | be243560dd6a7590c91ea4c6b3f3e5ec9ac5be1e | |
parent | 5c8a7533b1866d2a801a68a1b622008614dc3544 (diff) | |
download | src-releng/8.1.tar.gz src-releng/8.1.zip |
Fix named(8) DNSSEC validation Denial of Service.releng/8.1
Security: FreeBSD-SA-12:05.bind
Security: CVE-2012-3817
Obtained from: ISC
Approved by: so (simon)
Notes
Notes:
svn path=/releng/8.1/; revision=239108
-rw-r--r-- | UPDATING | 3 | ||||
-rw-r--r-- | contrib/bind9/lib/dns/resolver.c | 5 | ||||
-rw-r--r-- | sys/conf/newvers.sh | 2 |
3 files changed, 7 insertions, 3 deletions
@@ -16,6 +16,9 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.x IS SLOW ON IA64 OR SUN4V: sun4v support still needs work to become production ready. +20120806: p13 FreeBSD-SA-12:05.bind + Fix named(8) DNSSEC validation Denial of Service. + 20120618: p12 FreeBSD-SA-12:04.sysret Correct patch for FreeBSD-SA-12:04.sysret. diff --git a/contrib/bind9/lib/dns/resolver.c b/contrib/bind9/lib/dns/resolver.c index 244718fb5db0..41171e58b413 100644 --- a/contrib/bind9/lib/dns/resolver.c +++ b/contrib/bind9/lib/dns/resolver.c @@ -7929,6 +7929,7 @@ dns_resolver_addbadcache(dns_resolver_t *resolver, dns_name_t *name, } bad->type = type; bad->hashval = hashval; + bad->expire = *expire; isc_buffer_init(&buffer, bad + 1, name->length); dns_name_init(&bad->name, NULL); dns_name_copy(name, &bad->name, &buffer); @@ -7940,8 +7941,8 @@ dns_resolver_addbadcache(dns_resolver_t *resolver, dns_name_t *name, if (resolver->badcount < resolver->badhash * 2 && resolver->badhash > DNS_BADCACHE_SIZE) resizehash(resolver, &now, ISC_FALSE); - } - bad->expire = *expire; + } else + bad->expire = *expire; cleanup: UNLOCK(&resolver->lock); } diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 50bd18b7f795..68d784fcf3ea 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="8.1" -BRANCH="RELEASE-p12" +BRANCH="RELEASE-p13" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi |