aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJacques Vidrine <nectar@FreeBSD.org>2003-11-27 16:54:01 +0000
committerJacques Vidrine <nectar@FreeBSD.org>2003-11-27 16:54:01 +0000
commit976135f9e49f70296d381b0b282939b0444a7dd1 (patch)
treec625efa7bd287edfbe3c776fe6654c637478e269
parentbcb617c7568cc96ba4ae29b0ae902bf6b9ea3921 (diff)
downloadsrc-976135f9e49f70296d381b0b282939b0444a7dd1.tar.gz
src-976135f9e49f70296d381b0b282939b0444a7dd1.zip
Correct a remote denial-of-service attack in named(8).
Notes
Notes: svn path=/releng/5.0/; revision=123009
-rw-r--r--UPDATING3
-rw-r--r--contrib/bind/Version2
-rw-r--r--contrib/bind/bin/named/ns_resp.c12
-rw-r--r--sys/conf/newvers.sh2
4 files changed, 14 insertions, 5 deletions
diff --git a/UPDATING b/UPDATING
index eb83571ab4dd..f35d9c575fbc 100644
--- a/UPDATING
+++ b/UPDATING
@@ -17,6 +17,9 @@ minimal number of processes, if possible, for that patch. For those
updates that don't have an advisory, or to be safe, you can do a full
build and install as described in the COMMON ITEMS section.
+20031126: p19 FreeBSD-SA-03:19.bind
+ Corrected remote denial-of-service vulnerability in named(8).
+
20031003: p18 FreeBSD-SA-03:18.openssl
Corrected vulnerabilities in OpenSSL ASN.1 parsing.
diff --git a/contrib/bind/Version b/contrib/bind/Version
index e99a6add5fbb..b4a709b025d3 100644
--- a/contrib/bind/Version
+++ b/contrib/bind/Version
@@ -1 +1 @@
-8.3.3-REL
+8.3.3-REL-p1
diff --git a/contrib/bind/bin/named/ns_resp.c b/contrib/bind/bin/named/ns_resp.c
index c371fba842af..21c4095b2048 100644
--- a/contrib/bind/bin/named/ns_resp.c
+++ b/contrib/bind/bin/named/ns_resp.c
@@ -272,7 +272,7 @@ ns_resp(u_char *msg, int msglen, struct sockaddr_in from, struct qstream *qsp)
u_int qtype, qclass;
int restart; /* flag for processing cname response */
int validanswer, dbflags;
- int cname, lastwascname, externalcname;
+ int cname, lastwascname, externalcname, cachenegative;
int count, founddata, foundname;
int buflen;
int newmsglen;
@@ -912,6 +912,7 @@ tcp_retry:
cname = 0;
lastwascname = 0;
externalcname = 0;
+ cachenegative = 1;
strcpy(aname, qname);
if (count) {
@@ -981,6 +982,7 @@ tcp_retry:
name);
db_detach(&dp);
validanswer = 0;
+ cachenegative = 0;
continue;
}
if (type == T_CNAME &&
@@ -1011,6 +1013,7 @@ tcp_retry:
"last was cname, ignoring auth. and add.");
db_detach(&dp);
validanswer = 0;
+ cachenegative = 0;
break;
}
if (i < arfirst) {
@@ -1026,6 +1029,7 @@ tcp_retry:
sin_ntoa(from));
db_detach(&dp);
validanswer = 0;
+ cachenegative = 0;
continue;
} else if (!ns_samedomain(name,
qp->q_domain)) {
@@ -1039,6 +1043,7 @@ tcp_retry:
sin_ntoa(from));
db_detach(&dp);
validanswer = 0;
+ cachenegative = 0;
continue;
}
if (type == T_NS) {
@@ -1231,8 +1236,9 @@ tcp_retry:
)
)
{
- cache_n_resp(msg, msglen, from, qp->q_name,
- qp->q_class, qp->q_type);
+ if (cachenegative)
+ cache_n_resp(msg, msglen, from, qp->q_name,
+ qp->q_class, qp->q_type);
if (!qp->q_cmsglen && validanswer) {
ns_debug(ns_log_default, 3,
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 75832125cb81..8e4b89ba3bdc 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -36,7 +36,7 @@
TYPE="FreeBSD"
REVISION="5.0"
-BRANCH="RELEASE-p18"
+BRANCH="RELEASE-p19"
RELEASE="${REVISION}-${BRANCH}"
VERSION="${TYPE} ${RELEASE}"