mirror of
git://git.yoctoproject.org/poky.git
synced 2025-07-19 21:09:03 +02:00
bind: CVE-2016-1285 CVE-2016-1286
CVE-2016-1285 bind: malformed packet sent to rndc can trigger assertion failure CVE-2016-1286 bind: malformed signature records for DNAME records can trigger assertion failure [YOCTO #9400] External References: https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2016-1285 https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2016-1286 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-1285 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-1286 References to the Upstream commits and Security Advisories: CVE-2016-1285: https://kb.isc.org/article/AA-01352 https://source.isc.org/cgi-bin/gitweb.cgi?p=bind9.git;a=patch; h=31e4657cf246e41d4c5c890315cb6cf89a0db25a CVE-2016-1286_1: https://kb.isc.org/article/AA-01353 https://source.isc.org/cgi-bin/gitweb.cgi?p=bind9.git;a=patch; h=76c3c9fe9f3f1353b47214b8f98b3d7f53e10bc7 CVE-2016-1286_2: https://kb.isc.org/article/AA-01353 https://source.isc.org/cgi-bin/gitweb.cgi?p=bind9.git;a=patch; h=ce3cd91caee698cb144e1350c6c78292c6be6339 (From OE-Core rev: e289df4daa4b90fb95ae3602c244cba9d56a8c2f) Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com> Signed-off-by: Tudor Florea <tudor.florea@enea.com> Signed-off-by: Joshua Lock <joshua.g.lock@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
0c49cef4a6
commit
a8ff4c8f42
141
meta/recipes-connectivity/bind/bind/CVE-2016-1285.patch
Normal file
141
meta/recipes-connectivity/bind/bind/CVE-2016-1285.patch
Normal file
|
@ -0,0 +1,141 @@
|
|||
From 31e4657cf246e41d4c5c890315cb6cf89a0db25a Mon Sep 17 00:00:00 2001
|
||||
From: Mark Andrews <marka@isc.org>
|
||||
Date: Thu, 18 Feb 2016 12:11:27 +1100
|
||||
Subject: [PATCH] 4318. [security] Malformed control messages can
|
||||
trigger assertions in named and rndc. (CVE-2016-1285) [RT #41666]
|
||||
|
||||
(cherry picked from commit a2b15b3305acd52179e6f3dc7d073b07fbc40b8e)
|
||||
|
||||
CVE: CVE-2016-1285
|
||||
Upstream-Status: Backport
|
||||
|
||||
[Skipped CHANGES and doc/arm/notes.xml changes.]
|
||||
|
||||
Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com>
|
||||
---
|
||||
CHANGES | 3 +++
|
||||
bin/named/control.c | 2 +-
|
||||
bin/named/controlconf.c | 2 +-
|
||||
bin/rndc/rndc.c | 8 ++++----
|
||||
doc/arm/notes.xml | 8 ++++++++
|
||||
lib/isccc/cc.c | 14 +++++++-------
|
||||
6 files changed, 24 insertions(+), 13 deletions(-)
|
||||
|
||||
diff --git a/bin/named/control.c b/bin/named/control.c
|
||||
index 01fbe35..b1b744f 100644
|
||||
--- a/bin/named/control.c
|
||||
+++ b/bin/named/control.c
|
||||
@@ -89,7 +89,7 @@ ns_control_docommand(isccc_sexpr_t *message, isc_buffer_t *text) {
|
||||
#endif
|
||||
|
||||
data = isccc_alist_lookup(message, "_data");
|
||||
- if (data == NULL) {
|
||||
+ if (!isccc_alist_alistp(data)) {
|
||||
/*
|
||||
* No data section.
|
||||
*/
|
||||
diff --git a/bin/named/controlconf.c b/bin/named/controlconf.c
|
||||
index 95feaf5..31bdc48 100644
|
||||
--- a/bin/named/controlconf.c
|
||||
+++ b/bin/named/controlconf.c
|
||||
@@ -397,7 +397,7 @@ control_recvmessage(isc_task_t *task, isc_event_t *event) {
|
||||
* Limit exposure to replay attacks.
|
||||
*/
|
||||
_ctrl = isccc_alist_lookup(request, "_ctrl");
|
||||
- if (_ctrl == NULL) {
|
||||
+ if (!isccc_alist_alistp(_ctrl)) {
|
||||
log_invalid(&conn->ccmsg, ISC_R_FAILURE);
|
||||
goto cleanup_request;
|
||||
}
|
||||
diff --git a/bin/rndc/rndc.c b/bin/rndc/rndc.c
|
||||
index c7d8fe1..ba3ac3a 100644
|
||||
--- a/bin/rndc/rndc.c
|
||||
+++ b/bin/rndc/rndc.c
|
||||
@@ -249,8 +249,8 @@ rndc_recvdone(isc_task_t *task, isc_event_t *event) {
|
||||
DO("parse message", isccc_cc_fromwire(&source, &response, &secret));
|
||||
|
||||
data = isccc_alist_lookup(response, "_data");
|
||||
- if (data == NULL)
|
||||
- fatal("no data section in response");
|
||||
+ if (!isccc_alist_alistp(data))
|
||||
+ fatal("bad or missing data section in response");
|
||||
result = isccc_cc_lookupstring(data, "err", &errormsg);
|
||||
if (result == ISC_R_SUCCESS) {
|
||||
failed = ISC_TRUE;
|
||||
@@ -313,8 +313,8 @@ rndc_recvnonce(isc_task_t *task, isc_event_t *event) {
|
||||
DO("parse message", isccc_cc_fromwire(&source, &response, &secret));
|
||||
|
||||
_ctrl = isccc_alist_lookup(response, "_ctrl");
|
||||
- if (_ctrl == NULL)
|
||||
- fatal("_ctrl section missing");
|
||||
+ if (!isccc_alist_alistp(_ctrl))
|
||||
+ fatal("bad or missing ctrl section in response");
|
||||
nonce = 0;
|
||||
if (isccc_cc_lookupuint32(_ctrl, "_nonce", &nonce) != ISC_R_SUCCESS)
|
||||
nonce = 0;
|
||||
|
||||
diff --git a/lib/isccc/cc.c b/lib/isccc/cc.c
|
||||
index 9915568..ffcd584 100644
|
||||
--- a/lib/isccc/cc.c
|
||||
+++ b/lib/isccc/cc.c
|
||||
@@ -284,10 +284,10 @@ verify(isccc_sexpr_t *alist, unsigned char *data, unsigned int length,
|
||||
* Extract digest.
|
||||
*/
|
||||
_auth = isccc_alist_lookup(alist, "_auth");
|
||||
- if (_auth == NULL)
|
||||
+ if (!isccc_alist_alistp(_auth))
|
||||
return (ISC_R_FAILURE);
|
||||
hmd5 = isccc_alist_lookup(_auth, "hmd5");
|
||||
- if (hmd5 == NULL)
|
||||
+ if (!isccc_sexpr_binaryp(hmac))
|
||||
return (ISC_R_FAILURE);
|
||||
/*
|
||||
* Compute digest.
|
||||
@@ -540,7 +540,7 @@ isccc_cc_createack(isccc_sexpr_t *message, isc_boolean_t ok,
|
||||
REQUIRE(ackp != NULL && *ackp == NULL);
|
||||
|
||||
_ctrl = isccc_alist_lookup(message, "_ctrl");
|
||||
- if (_ctrl == NULL ||
|
||||
+ if (!isccc_alist_alistp(_ctrl) ||
|
||||
isccc_cc_lookupuint32(_ctrl, "_ser", &serial) != ISC_R_SUCCESS ||
|
||||
isccc_cc_lookupuint32(_ctrl, "_tim", &t) != ISC_R_SUCCESS)
|
||||
return (ISC_R_FAILURE);
|
||||
@@ -584,7 +584,7 @@ isccc_cc_isack(isccc_sexpr_t *message) {
|
||||
isccc_sexpr_t *_ctrl;
|
||||
|
||||
_ctrl = isccc_alist_lookup(message, "_ctrl");
|
||||
- if (_ctrl == NULL)
|
||||
+ if (!isccc_alist_alistp(_ctrl))
|
||||
return (ISC_FALSE);
|
||||
if (isccc_cc_lookupstring(_ctrl, "_ack", NULL) == ISC_R_SUCCESS)
|
||||
return (ISC_TRUE);
|
||||
@@ -596,7 +596,7 @@ isccc_cc_isreply(isccc_sexpr_t *message) {
|
||||
isccc_sexpr_t *_ctrl;
|
||||
|
||||
_ctrl = isccc_alist_lookup(message, "_ctrl");
|
||||
- if (_ctrl == NULL)
|
||||
+ if (!isccc_alist_alistp(_ctrl))
|
||||
return (ISC_FALSE);
|
||||
if (isccc_cc_lookupstring(_ctrl, "_rpl", NULL) == ISC_R_SUCCESS)
|
||||
return (ISC_TRUE);
|
||||
@@ -616,7 +616,7 @@ isccc_cc_createresponse(isccc_sexpr_t *message, isccc_time_t now,
|
||||
|
||||
_ctrl = isccc_alist_lookup(message, "_ctrl");
|
||||
_data = isccc_alist_lookup(message, "_data");
|
||||
- if (_ctrl == NULL || _data == NULL ||
|
||||
+ if (!isccc_alist_alistp(_ctrl) || !isccc_alist_alistp(_data) ||
|
||||
isccc_cc_lookupuint32(_ctrl, "_ser", &serial) != ISC_R_SUCCESS ||
|
||||
isccc_cc_lookupstring(_data, "type", &type) != ISC_R_SUCCESS)
|
||||
return (ISC_R_FAILURE);
|
||||
@@ -797,7 +797,7 @@ isccc_cc_checkdup(isccc_symtab_t *symtab, isccc_sexpr_t *message,
|
||||
isccc_sexpr_t *_ctrl;
|
||||
|
||||
_ctrl = isccc_alist_lookup(message, "_ctrl");
|
||||
- if (_ctrl == NULL ||
|
||||
+ if (!isccc_alist_alistp(_ctrl) ||
|
||||
isccc_cc_lookupstring(_ctrl, "_ser", &_ser) != ISC_R_SUCCESS ||
|
||||
isccc_cc_lookupstring(_ctrl, "_tim", &_tim) != ISC_R_SUCCESS)
|
||||
return (ISC_R_FAILURE);
|
||||
--
|
||||
1.9.1
|
||||
|
78
meta/recipes-connectivity/bind/bind/CVE-2016-1286_1.patch
Normal file
78
meta/recipes-connectivity/bind/bind/CVE-2016-1286_1.patch
Normal file
|
@ -0,0 +1,78 @@
|
|||
From 76c3c9fe9f3f1353b47214b8f98b3d7f53e10bc7 Mon Sep 17 00:00:00 2001
|
||||
From: Mukund Sivaraman <muks@isc.org>
|
||||
Date: Mon, 22 Feb 2016 12:22:43 +0530
|
||||
Subject: [PATCH] Fix resolver assertion failure due to improper DNAME handling
|
||||
(CVE-2016-1286) (#41753)
|
||||
|
||||
(cherry picked from commit 5995fec51cc8bb7e53804e4936e60aa1537f3673)
|
||||
(cherry picked from commit 456e1eadd2a3a2fb9617e60d4db90ef4ba7c6ba3)
|
||||
|
||||
CVE: CVE-2016-1286
|
||||
Upstream-Status: Backport
|
||||
|
||||
[Skipped CHANGES and doc/arm/notes.xml changes.]
|
||||
|
||||
Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com>
|
||||
---
|
||||
CHANGES | 4 ++++
|
||||
doc/arm/notes.xml | 7 +++++++
|
||||
lib/dns/resolver.c | 33 ++++++++++++++++++---------------
|
||||
3 files changed, 29 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
|
||||
index 735f7d2..0602070 100644
|
||||
--- a/lib/dns/resolver.c
|
||||
+++ b/lib/dns/resolver.c
|
||||
@@ -6701,21 +6701,26 @@ answer_response(fetchctx_t *fctx) {
|
||||
isc_boolean_t found_dname = ISC_FALSE;
|
||||
dns_name_t *dname_name;
|
||||
|
||||
+ /*
|
||||
+ * Only pass DNAME or RRSIG(DNAME).
|
||||
+ */
|
||||
+ if (rdataset->type != dns_rdatatype_dname &&
|
||||
+ (rdataset->type != dns_rdatatype_rrsig ||
|
||||
+ rdataset->covers != dns_rdatatype_dname))
|
||||
+ continue;
|
||||
+
|
||||
+ /*
|
||||
+ * If we're not chaining, then the DNAME and
|
||||
+ * its signature should not be external.
|
||||
+ */
|
||||
+ if (!chaining && external) {
|
||||
+ log_formerr(fctx, "external DNAME");
|
||||
+ return (DNS_R_FORMERR);
|
||||
+ }
|
||||
+
|
||||
found = ISC_FALSE;
|
||||
aflag = 0;
|
||||
if (rdataset->type == dns_rdatatype_dname) {
|
||||
- /*
|
||||
- * We're looking for something else,
|
||||
- * but we found a DNAME.
|
||||
- *
|
||||
- * If we're not chaining, then the
|
||||
- * DNAME should not be external.
|
||||
- */
|
||||
- if (!chaining && external) {
|
||||
- log_formerr(fctx,
|
||||
- "external DNAME");
|
||||
- return (DNS_R_FORMERR);
|
||||
- }
|
||||
found = ISC_TRUE;
|
||||
want_chaining = ISC_TRUE;
|
||||
POST(want_chaining);
|
||||
@@ -6744,9 +6749,7 @@ answer_response(fetchctx_t *fctx) {
|
||||
&fctx->domain)) {
|
||||
return (DNS_R_SERVFAIL);
|
||||
}
|
||||
- } else if (rdataset->type == dns_rdatatype_rrsig
|
||||
- && rdataset->covers ==
|
||||
- dns_rdatatype_dname) {
|
||||
+ } else {
|
||||
/*
|
||||
* We've found a signature that
|
||||
* covers the DNAME.
|
||||
--
|
||||
1.9.1
|
||||
|
318
meta/recipes-connectivity/bind/bind/CVE-2016-1286_2.patch
Normal file
318
meta/recipes-connectivity/bind/bind/CVE-2016-1286_2.patch
Normal file
|
@ -0,0 +1,318 @@
|
|||
From ce3cd91caee698cb144e1350c6c78292c6be6339 Mon Sep 17 00:00:00 2001
|
||||
From: Mark Andrews <marka@isc.org>
|
||||
Date: Mon, 29 Feb 2016 07:16:48 +1100
|
||||
Subject: [PATCH] Part 2 of: 4319. [security] Fix resolver assertion
|
||||
failure due to improper DNAME handling when parsing
|
||||
fetch reply messages. (CVE-2016-1286) [RT #41753]
|
||||
|
||||
(cherry picked from commit 2de89ee9de8c8da9dc153a754b02dcdbb7fe2374)
|
||||
|
||||
CVE: CVE-2016-1286
|
||||
Upstream-Status: Backport
|
||||
|
||||
Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com>
|
||||
---
|
||||
lib/dns/resolver.c | 192 ++++++++++++++++++++++++++---------------------------
|
||||
1 file changed, 93 insertions(+), 99 deletions(-)
|
||||
|
||||
diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
|
||||
index 0602070..273e06c 100644
|
||||
--- a/lib/dns/resolver.c
|
||||
+++ b/lib/dns/resolver.c
|
||||
@@ -5808,14 +5808,11 @@ cname_target(dns_rdataset_t *rdataset, dns_name_t *tname) {
|
||||
}
|
||||
|
||||
static inline isc_result_t
|
||||
-dname_target(fetchctx_t *fctx, dns_rdataset_t *rdataset, dns_name_t *qname,
|
||||
- dns_name_t *oname, dns_fixedname_t *fixeddname)
|
||||
+dname_target(dns_rdataset_t *rdataset, dns_name_t *qname,
|
||||
+ unsigned int nlabels, dns_fixedname_t *fixeddname)
|
||||
{
|
||||
isc_result_t result;
|
||||
dns_rdata_t rdata = DNS_RDATA_INIT;
|
||||
- unsigned int nlabels;
|
||||
- int order;
|
||||
- dns_namereln_t namereln;
|
||||
dns_rdata_dname_t dname;
|
||||
dns_fixedname_t prefix;
|
||||
|
||||
@@ -5830,21 +5827,6 @@ dname_target(fetchctx_t *fctx, dns_rdataset_t *rdataset, dns_name_t *qname,
|
||||
if (result != ISC_R_SUCCESS)
|
||||
return (result);
|
||||
|
||||
- /*
|
||||
- * Get the prefix of qname.
|
||||
- */
|
||||
- namereln = dns_name_fullcompare(qname, oname, &order, &nlabels);
|
||||
- if (namereln != dns_namereln_subdomain) {
|
||||
- char qbuf[DNS_NAME_FORMATSIZE];
|
||||
- char obuf[DNS_NAME_FORMATSIZE];
|
||||
-
|
||||
- dns_rdata_freestruct(&dname);
|
||||
- dns_name_format(qname, qbuf, sizeof(qbuf));
|
||||
- dns_name_format(oname, obuf, sizeof(obuf));
|
||||
- log_formerr(fctx, "unrelated DNAME in answer: "
|
||||
- "%s is not in %s", qbuf, obuf);
|
||||
- return (DNS_R_FORMERR);
|
||||
- }
|
||||
dns_fixedname_init(&prefix);
|
||||
dns_name_split(qname, nlabels, dns_fixedname_name(&prefix), NULL);
|
||||
dns_fixedname_init(fixeddname);
|
||||
@@ -6470,13 +6452,13 @@ static isc_result_t
|
||||
answer_response(fetchctx_t *fctx) {
|
||||
isc_result_t result;
|
||||
dns_message_t *message;
|
||||
- dns_name_t *name, *qname, tname, *ns_name;
|
||||
+ dns_name_t *name, *dname, *qname, tname, *ns_name;
|
||||
dns_rdataset_t *rdataset, *ns_rdataset;
|
||||
isc_boolean_t done, external, chaining, aa, found, want_chaining;
|
||||
isc_boolean_t have_answer, found_cname, found_type, wanted_chaining;
|
||||
unsigned int aflag;
|
||||
dns_rdatatype_t type;
|
||||
- dns_fixedname_t dname, fqname;
|
||||
+ dns_fixedname_t fdname, fqname;
|
||||
dns_view_t *view;
|
||||
|
||||
FCTXTRACE("answer_response");
|
||||
@@ -6504,10 +6486,15 @@ answer_response(fetchctx_t *fctx) {
|
||||
view = fctx->res->view;
|
||||
result = dns_message_firstname(message, DNS_SECTION_ANSWER);
|
||||
while (!done && result == ISC_R_SUCCESS) {
|
||||
+ dns_namereln_t namereln;
|
||||
+ int order;
|
||||
+ unsigned int nlabels;
|
||||
+
|
||||
name = NULL;
|
||||
dns_message_currentname(message, DNS_SECTION_ANSWER, &name);
|
||||
external = ISC_TF(!dns_name_issubdomain(name, &fctx->domain));
|
||||
- if (dns_name_equal(name, qname)) {
|
||||
+ namereln = dns_name_fullcompare(qname, name, &order, &nlabels);
|
||||
+ if (namereln == dns_namereln_equal) {
|
||||
wanted_chaining = ISC_FALSE;
|
||||
for (rdataset = ISC_LIST_HEAD(name->list);
|
||||
rdataset != NULL;
|
||||
@@ -6632,10 +6619,11 @@ answer_response(fetchctx_t *fctx) {
|
||||
*/
|
||||
INSIST(!external);
|
||||
if (aflag ==
|
||||
- DNS_RDATASETATTR_ANSWER)
|
||||
+ DNS_RDATASETATTR_ANSWER) {
|
||||
have_answer = ISC_TRUE;
|
||||
- name->attributes |=
|
||||
- DNS_NAMEATTR_ANSWER;
|
||||
+ name->attributes |=
|
||||
+ DNS_NAMEATTR_ANSWER;
|
||||
+ }
|
||||
rdataset->attributes |= aflag;
|
||||
if (aa)
|
||||
rdataset->trust =
|
||||
@@ -6690,6 +6678,8 @@ answer_response(fetchctx_t *fctx) {
|
||||
if (wanted_chaining)
|
||||
chaining = ISC_TRUE;
|
||||
} else {
|
||||
+ dns_rdataset_t *dnameset = NULL;
|
||||
+
|
||||
/*
|
||||
* Look for a DNAME (or its SIG). Anything else is
|
||||
* ignored.
|
||||
@@ -6697,10 +6687,8 @@ answer_response(fetchctx_t *fctx) {
|
||||
wanted_chaining = ISC_FALSE;
|
||||
for (rdataset = ISC_LIST_HEAD(name->list);
|
||||
rdataset != NULL;
|
||||
- rdataset = ISC_LIST_NEXT(rdataset, link)) {
|
||||
- isc_boolean_t found_dname = ISC_FALSE;
|
||||
- dns_name_t *dname_name;
|
||||
-
|
||||
+ rdataset = ISC_LIST_NEXT(rdataset, link))
|
||||
+ {
|
||||
/*
|
||||
* Only pass DNAME or RRSIG(DNAME).
|
||||
*/
|
||||
@@ -6714,20 +6702,41 @@ answer_response(fetchctx_t *fctx) {
|
||||
* its signature should not be external.
|
||||
*/
|
||||
if (!chaining && external) {
|
||||
- log_formerr(fctx, "external DNAME");
|
||||
+ char qbuf[DNS_NAME_FORMATSIZE];
|
||||
+ char obuf[DNS_NAME_FORMATSIZE];
|
||||
+
|
||||
+ dns_name_format(name, qbuf,
|
||||
+ sizeof(qbuf));
|
||||
+ dns_name_format(&fctx->domain, obuf,
|
||||
+ sizeof(obuf));
|
||||
+ log_formerr(fctx, "external DNAME or "
|
||||
+ "RRSIG covering DNAME "
|
||||
+ "in answer: %s is "
|
||||
+ "not in %s", qbuf, obuf);
|
||||
+ return (DNS_R_FORMERR);
|
||||
+ }
|
||||
+
|
||||
+ if (namereln != dns_namereln_subdomain) {
|
||||
+ char qbuf[DNS_NAME_FORMATSIZE];
|
||||
+ char obuf[DNS_NAME_FORMATSIZE];
|
||||
+
|
||||
+ dns_name_format(qname, qbuf,
|
||||
+ sizeof(qbuf));
|
||||
+ dns_name_format(name, obuf,
|
||||
+ sizeof(obuf));
|
||||
+ log_formerr(fctx, "unrelated DNAME "
|
||||
+ "in answer: %s is "
|
||||
+ "not in %s", qbuf, obuf);
|
||||
return (DNS_R_FORMERR);
|
||||
}
|
||||
|
||||
- found = ISC_FALSE;
|
||||
aflag = 0;
|
||||
if (rdataset->type == dns_rdatatype_dname) {
|
||||
- found = ISC_TRUE;
|
||||
want_chaining = ISC_TRUE;
|
||||
POST(want_chaining);
|
||||
aflag = DNS_RDATASETATTR_ANSWER;
|
||||
- result = dname_target(fctx, rdataset,
|
||||
- qname, name,
|
||||
- &dname);
|
||||
+ result = dname_target(rdataset, qname,
|
||||
+ nlabels, &fdname);
|
||||
if (result == ISC_R_NOSPACE) {
|
||||
/*
|
||||
* We can't construct the
|
||||
@@ -6739,14 +6748,12 @@ answer_response(fetchctx_t *fctx) {
|
||||
} else if (result != ISC_R_SUCCESS)
|
||||
return (result);
|
||||
else
|
||||
- found_dname = ISC_TRUE;
|
||||
+ dnameset = rdataset;
|
||||
|
||||
- dname_name = dns_fixedname_name(&dname);
|
||||
+ dname = dns_fixedname_name(&fdname);
|
||||
if (!is_answertarget_allowed(view,
|
||||
- qname,
|
||||
- rdataset->type,
|
||||
- dname_name,
|
||||
- &fctx->domain)) {
|
||||
+ qname, rdataset->type,
|
||||
+ dname, &fctx->domain)) {
|
||||
return (DNS_R_SERVFAIL);
|
||||
}
|
||||
} else {
|
||||
@@ -6754,73 +6761,60 @@ answer_response(fetchctx_t *fctx) {
|
||||
* We've found a signature that
|
||||
* covers the DNAME.
|
||||
*/
|
||||
- found = ISC_TRUE;
|
||||
aflag = DNS_RDATASETATTR_ANSWERSIG;
|
||||
}
|
||||
|
||||
- if (found) {
|
||||
+ /*
|
||||
+ * We've found an answer to our
|
||||
+ * question.
|
||||
+ */
|
||||
+ name->attributes |= DNS_NAMEATTR_CACHE;
|
||||
+ rdataset->attributes |= DNS_RDATASETATTR_CACHE;
|
||||
+ rdataset->trust = dns_trust_answer;
|
||||
+ if (!chaining) {
|
||||
/*
|
||||
- * We've found an answer to our
|
||||
- * question.
|
||||
+ * This data is "the" answer to
|
||||
+ * our question only if we're
|
||||
+ * not chaining.
|
||||
*/
|
||||
- name->attributes |=
|
||||
- DNS_NAMEATTR_CACHE;
|
||||
- rdataset->attributes |=
|
||||
- DNS_RDATASETATTR_CACHE;
|
||||
- rdataset->trust = dns_trust_answer;
|
||||
- if (!chaining) {
|
||||
- /*
|
||||
- * This data is "the" answer
|
||||
- * to our question only if
|
||||
- * we're not chaining.
|
||||
- */
|
||||
- INSIST(!external);
|
||||
- if (aflag ==
|
||||
- DNS_RDATASETATTR_ANSWER)
|
||||
- have_answer = ISC_TRUE;
|
||||
+ INSIST(!external);
|
||||
+ if (aflag == DNS_RDATASETATTR_ANSWER) {
|
||||
+ have_answer = ISC_TRUE;
|
||||
name->attributes |=
|
||||
DNS_NAMEATTR_ANSWER;
|
||||
- rdataset->attributes |= aflag;
|
||||
- if (aa)
|
||||
- rdataset->trust =
|
||||
- dns_trust_authanswer;
|
||||
- } else if (external) {
|
||||
- rdataset->attributes |=
|
||||
- DNS_RDATASETATTR_EXTERNAL;
|
||||
- }
|
||||
-
|
||||
- /*
|
||||
- * DNAME chaining.
|
||||
- */
|
||||
- if (found_dname) {
|
||||
- /*
|
||||
- * Copy the dname into the
|
||||
- * qname fixed name.
|
||||
- *
|
||||
- * Although we check for
|
||||
- * failure of the copy
|
||||
- * operation, in practice it
|
||||
- * should never fail since
|
||||
- * we already know that the
|
||||
- * result fits in a fixedname.
|
||||
- */
|
||||
- dns_fixedname_init(&fqname);
|
||||
- result = dns_name_copy(
|
||||
- dns_fixedname_name(&dname),
|
||||
- dns_fixedname_name(&fqname),
|
||||
- NULL);
|
||||
- if (result != ISC_R_SUCCESS)
|
||||
- return (result);
|
||||
- wanted_chaining = ISC_TRUE;
|
||||
- name->attributes |=
|
||||
- DNS_NAMEATTR_CHAINING;
|
||||
- rdataset->attributes |=
|
||||
- DNS_RDATASETATTR_CHAINING;
|
||||
- qname = dns_fixedname_name(
|
||||
- &fqname);
|
||||
}
|
||||
+ rdataset->attributes |= aflag;
|
||||
+ if (aa)
|
||||
+ rdataset->trust =
|
||||
+ dns_trust_authanswer;
|
||||
+ } else if (external) {
|
||||
+ rdataset->attributes |=
|
||||
+ DNS_RDATASETATTR_EXTERNAL;
|
||||
}
|
||||
}
|
||||
+
|
||||
+ /*
|
||||
+ * DNAME chaining.
|
||||
+ */
|
||||
+ if (dnameset != NULL) {
|
||||
+ /*
|
||||
+ * Copy the dname into the qname fixed name.
|
||||
+ *
|
||||
+ * Although we check for failure of the copy
|
||||
+ * operation, in practice it should never fail
|
||||
+ * since we already know that the result fits
|
||||
+ * in a fixedname.
|
||||
+ */
|
||||
+ dns_fixedname_init(&fqname);
|
||||
+ qname = dns_fixedname_name(&fqname);
|
||||
+ result = dns_name_copy(dname, qname, NULL);
|
||||
+ if (result != ISC_R_SUCCESS)
|
||||
+ return (result);
|
||||
+ wanted_chaining = ISC_TRUE;
|
||||
+ name->attributes |= DNS_NAMEATTR_CHAINING;
|
||||
+ dnameset->attributes |=
|
||||
+ DNS_RDATASETATTR_CHAINING;
|
||||
+ }
|
||||
if (wanted_chaining)
|
||||
chaining = ISC_TRUE;
|
||||
}
|
||||
--
|
||||
1.9.1
|
||||
|
|
@ -0,0 +1,31 @@
|
|||
From a078c9eeae8c2db7edf2b15ff1d25a3a297c7512 Mon Sep 17 00:00:00 2001
|
||||
From: Evan Hunt <each@isc.org>
|
||||
Date: Wed, 17 Feb 2016 19:13:22 -0800
|
||||
Subject: [PATCH] [v9_9] fix backport error
|
||||
|
||||
This fixes typo in the:
|
||||
CVE-2016-1285.patch [upstream commit 31e4657cf246e41d4c5c890315cb6cf89a0db25a]
|
||||
|
||||
Upstream-Status: Backport
|
||||
|
||||
Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com>
|
||||
---
|
||||
lib/isccc/cc.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/isccc/cc.c b/lib/isccc/cc.c
|
||||
index ffcd584..9c7d18c 100644
|
||||
--- a/lib/isccc/cc.c
|
||||
+++ b/lib/isccc/cc.c
|
||||
@@ -287,7 +287,7 @@ verify(isccc_sexpr_t *alist, unsigned char *data, unsigned int length,
|
||||
if (!isccc_alist_alistp(_auth))
|
||||
return (ISC_R_FAILURE);
|
||||
hmd5 = isccc_alist_lookup(_auth, "hmd5");
|
||||
- if (!isccc_sexpr_binaryp(hmac))
|
||||
+ if (!isccc_sexpr_binaryp(hmd5))
|
||||
return (ISC_R_FAILURE);
|
||||
/*
|
||||
* Compute digest.
|
||||
--
|
||||
1.9.1
|
||||
|
|
@ -28,6 +28,10 @@ SRC_URI = "ftp://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.gz \
|
|||
file://CVE-2015-8000.patch \
|
||||
file://CVE-2015-8704.patch \
|
||||
file://CVE-2015-8461.patch \
|
||||
file://CVE-2016-1285.patch \
|
||||
file://fix-typo-in-CVE-2016-1285.patch \
|
||||
file://CVE-2016-1286_1.patch \
|
||||
file://CVE-2016-1286_2.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "e676c65cad5234617ee22f48e328c24e"
|
||||
|
|
Loading…
Reference in New Issue
Block a user