summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArmin Kuster <akuster@mvista.com>2019-09-04 22:44:12 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-10-08 22:52:28 +0100
commit3d3a165925f4221ce8dab092cab14d8fba23a09e (patch)
treee9b543fb2c2c20d72dde5a4837995760a77e8d6d
parent176dc6eb01bea925aa88a8dcab9f63e7dcd3dab5 (diff)
downloadpoky-3d3a165925f4221ce8dab092cab14d8fba23a09e.tar.gz
bind: update to latest LTS 9.11.5
Source: bind.org MR: 99750 Type: Security Fix Disposition: Backport from bind.org ChangeID: bca5c436229f1b8c7e8eb3e45fc6188ffdb5e224 Description: includes: CVE-2018-5738 drop patch for CVE-2018-5740 now included in update see: https://ftp.isc.org/isc/bind9/9.11.5/RELEASE-NOTES-bind-9.11.5.html Add RECIPE_NO_UPDATE_REASON for lts (From OE-Core rev: 25b2f2c6fc67eabb0e7f0b7c5ffe08c554613c10) Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> [Also includes CVE-2018-5740] Signed-off-by: Armin Kuster <akuster@mvista.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/bind/bind/CVE-2018-5740.patch72
-rw-r--r--meta/recipes-connectivity/bind/bind_9.11.5.bb (renamed from meta/recipes-connectivity/bind/bind_9.11.4.bb)6
2 files changed, 3 insertions, 75 deletions
diff --git a/meta/recipes-connectivity/bind/bind/CVE-2018-5740.patch b/meta/recipes-connectivity/bind/bind/CVE-2018-5740.patch
deleted file mode 100644
index 7a2ba7eab6..0000000000
--- a/meta/recipes-connectivity/bind/bind/CVE-2018-5740.patch
+++ /dev/null
@@ -1,72 +0,0 @@
1Upstream-Status: Backport [https://ftp.isc.org/isc/bind9/9.11.4-P1/patches/CVE-2018-5740]
2
3CVE: CVE-2018-5740
4
5Signed-off-by: Changqing Li <changqing.li@windriver.com>
6
7diff --git a/CHANGES b/CHANGES
8index 750b600..3d8d655 100644
9--- a/CHANGES
10+++ b/CHANGES
11@@ -1,3 +1,9 @@
12+ --- 9.11.4-P1 released ---
13+
14+4997. [security] named could crash during recursive processing
15+ of DNAME records when "deny-answer-aliases" was
16+ in use. (CVE-2018-5740) [GL #387]
17+
18 --- 9.11.4 released ---
19
20 --- 9.11.4rc2 released ---
21diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
22index 8f674a2..41d1385 100644
23--- a/lib/dns/resolver.c
24+++ b/lib/dns/resolver.c
25@@ -6318,6 +6318,7 @@ is_answertarget_allowed(fetchctx_t *fctx, dns_name_t *qname, dns_name_t *rname,
26 unsigned int nlabels;
27 dns_fixedname_t fixed;
28 dns_name_t prefix;
29+ int order;
30
31 REQUIRE(rdataset != NULL);
32 REQUIRE(rdataset->type == dns_rdatatype_cname ||
33@@ -6340,17 +6341,25 @@ is_answertarget_allowed(fetchctx_t *fctx, dns_name_t *qname, dns_name_t *rname,
34 tname = &cname.cname;
35 break;
36 case dns_rdatatype_dname:
37+ if (dns_name_fullcompare(qname, rname, &order, &nlabels) !=
38+ dns_namereln_subdomain)
39+ {
40+ return (ISC_TRUE);
41+ }
42 result = dns_rdata_tostruct(&rdata, &dname, NULL);
43 RUNTIME_CHECK(result == ISC_R_SUCCESS);
44 dns_name_init(&prefix, NULL);
45 tname = dns_fixedname_initname(&fixed);
46- nlabels = dns_name_countlabels(qname) -
47- dns_name_countlabels(rname);
48+ nlabels = dns_name_countlabels(rname);
49 dns_name_split(qname, nlabels, &prefix, NULL);
50 result = dns_name_concatenate(&prefix, &dname.dname, tname,
51 NULL);
52- if (result == DNS_R_NAMETOOLONG)
53+ if (result == DNS_R_NAMETOOLONG) {
54+ if (chainingp != NULL) {
55+ *chainingp = ISC_TRUE;
56+ }
57 return (ISC_TRUE);
58+ }
59 RUNTIME_CHECK(result == ISC_R_SUCCESS);
60 break;
61 default:
62@@ -7071,7 +7080,9 @@ answer_response(fetchctx_t *fctx) {
63 }
64 if ((ardataset->type == dns_rdatatype_cname ||
65 ardataset->type == dns_rdatatype_dname) &&
66- !is_answertarget_allowed(fctx, qname, aname, ardataset,
67+ type != ardataset->type &&
68+ type != dns_rdatatype_any &&
69+ !is_answertarget_allowed(fctx, qname, aname, ardataset,
70 NULL))
71 {
72 return (DNS_R_SERVFAIL);
diff --git a/meta/recipes-connectivity/bind/bind_9.11.4.bb b/meta/recipes-connectivity/bind/bind_9.11.5.bb
index cb4a21a9af..21e979fd9c 100644
--- a/meta/recipes-connectivity/bind/bind_9.11.4.bb
+++ b/meta/recipes-connectivity/bind/bind_9.11.5.bb
@@ -20,14 +20,14 @@ SRC_URI = "https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.gz \
20 file://0001-configure.in-remove-useless-L-use_openssl-lib.patch \ 20 file://0001-configure.in-remove-useless-L-use_openssl-lib.patch \
21 file://0001-named-lwresd-V-and-start-log-hide-build-options.patch \ 21 file://0001-named-lwresd-V-and-start-log-hide-build-options.patch \
22 file://0001-avoid-start-failure-with-bind-user.patch \ 22 file://0001-avoid-start-failure-with-bind-user.patch \
23 file://CVE-2018-5740.patch \
24" 23"
25 24
26SRC_URI[md5sum] = "9b4834d78f30cdb796ce437262272a36" 25SRC_URI[md5sum] = "17a0d02102117c9a221e857cf2cc8157"
27SRC_URI[sha256sum] = "595070b031f869f8939656b5a5d11b121211967f15f6afeafa895df745279617" 26SRC_URI[sha256sum] = "a4cae11dad954bdd4eb592178f875bfec09fcc7e29fe0f6b7a4e5b5c6bc61322"
28 27
29UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/" 28UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/"
30UPSTREAM_CHECK_REGEX = "(?P<pver>9(\.\d+)+(-P\d+)*)/" 29UPSTREAM_CHECK_REGEX = "(?P<pver>9(\.\d+)+(-P\d+)*)/"
30RECIPE_NO_UPDATE_REASON = "9.11 is LTS 2021"
31 31
32inherit autotools update-rc.d systemd useradd pkgconfig multilib_script 32inherit autotools update-rc.d systemd useradd pkgconfig multilib_script
33 33