diff options
| author | Simon L. B. Nielsen <simon@FreeBSD.org> | 2011-05-28 08:44:39 +0000 |
|---|---|---|
| committer | Simon L. B. Nielsen <simon@FreeBSD.org> | 2011-05-28 08:44:39 +0000 |
| commit | 3d530be3df6cf5e6ebccc6a7aa21c00ff2ec346c (patch) | |
| tree | 8b81e07a522d2b51cdcf161a3b47b14643fc53b6 | |
| parent | c86a3ed6524f8ab6395e55670d5a6e0a86c46b4d (diff) | |
Notes
| -rw-r--r-- | UPDATING | 4 | ||||
| -rw-r--r-- | contrib/bind9/lib/dns/ncache.c | 2 | ||||
| -rw-r--r-- | sys/conf/newvers.sh | 2 |
3 files changed, 6 insertions, 2 deletions
@@ -8,6 +8,10 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before running portupgrade. +20110528: p6 FreeBSD-SA-11:02.bind + Fix BIND remote DoS with large RRSIG RRsets and negative + caching. + 20110420: p5 FreeBSD-SA-11:01.mountd Fix CIDR parsing bug in mountd ACLs. diff --git a/contrib/bind9/lib/dns/ncache.c b/contrib/bind9/lib/dns/ncache.c index 1fdc5c80e2d0..a72b62705b1f 100644 --- a/contrib/bind9/lib/dns/ncache.c +++ b/contrib/bind9/lib/dns/ncache.c @@ -160,7 +160,7 @@ dns_ncache_add(dns_message_t *message, dns_db_t *cache, dns_dbnode_t *node, */ isc_buffer_availableregion(&buffer, &r); - if (r.length < 2) + if (r.length < 3) return (ISC_R_NOSPACE); isc_buffer_putuint16(&buffer, rdataset->type); diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index d346b451313b..f2c5ce5894cb 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="7.3" -BRANCH="RELEASE-p5" +BRANCH="RELEASE-p6" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi |