From 104d050d420ee4aa14b772850742699b15d127d6 Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Sat, 30 Jan 2016 19:29:32 -0800 Subject: bind: Security fix CVE-2015-8461 CVE-2015-8461 bind: race condition when handling socket errors can lead to an assertion failure in resolver.c\ (From OE-Core master rev: 1656eaa722952861ec73362776bd0c4826aec3da) Hand applied Changelog changes. Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster Signed-off-by: Joshua Lock --- .../bind/bind/CVE-2015-8461.patch | 45 ++++++++++++++++++++++ meta/recipes-connectivity/bind/bind_9.9.5.bb | 3 +- 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-connectivity/bind/bind/CVE-2015-8461.patch diff --git a/meta/recipes-connectivity/bind/bind/CVE-2015-8461.patch b/meta/recipes-connectivity/bind/bind/CVE-2015-8461.patch new file mode 100644 index 0000000000..32eeeb1949 --- /dev/null +++ b/meta/recipes-connectivity/bind/bind/CVE-2015-8461.patch @@ -0,0 +1,45 @@ +From adbf81335b67be0cebdcf9f1f4fcb38ef4814f4d Mon Sep 17 00:00:00 2001 +From: Mark Andrews +Date: Thu, 25 Jun 2015 18:36:27 +1000 +Subject: [PATCH] 4146. [bug] Address reference leak that could + prevent a clean shutdown. [RT #37125] + +Upstream-Status: Backport + +https://source.isc.org/cgi-bin/gitweb.cgi?p=bind9.git;a=commit;h=adbf81335b67be0cebdcf9f1f4fcb38ef4814f4d + +CVE: CVE-2015-8461 +Signed-off-by: Armin Kuster +--- + CHANGES | 3 +++ + lib/dns/resolver.c | 5 +++++ + 2 files changed, 8 insertions(+) + +Index: bind-9.9.5/lib/dns/resolver.c +=================================================================== +--- bind-9.9.5.orig/lib/dns/resolver.c ++++ bind-9.9.5/lib/dns/resolver.c +@@ -1570,6 +1570,11 @@ fctx_query(fetchctx_t *fctx, dns_adbaddr + if (query->dispatch != NULL) + dns_dispatch_detach(&query->dispatch); + ++ LOCK(&res->buckets[fctx->bucketnum].lock); ++ INSIST(fctx->references > 1); ++ fctx->references--; ++ UNLOCK(&res->buckets[fctx->bucketnum].lock); ++ + cleanup_query: + if (query->connects == 0) { + query->magic = 0; +Index: bind-9.9.5/CHANGES +=================================================================== +--- bind-9.9.5.orig/CHANGES ++++ bind-9.9.5/CHANGES +@@ -1,4 +1,7 @@ + --- 9.9.6-P2 released --- ++4146. [bug] Address reference leak that could prevent a clean ++ shutdown. [RT #37125] ++ + + 4053. [security] Revoking a managed trust anchor and supplying + an untrusted replacement could cause named diff --git a/meta/recipes-connectivity/bind/bind_9.9.5.bb b/meta/recipes-connectivity/bind/bind_9.9.5.bb index a904d6ebbe..7ba0d2be3c 100644 --- a/meta/recipes-connectivity/bind/bind_9.9.5.bb +++ b/meta/recipes-connectivity/bind/bind_9.9.5.bb @@ -27,7 +27,8 @@ SRC_URI = "ftp://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.gz \ file://CVE-2015-5722.patch \ file://CVE-2015-8000.patch \ file://CVE-2015-8704.patch \ - " + file://CVE-2015-8461.patch \ + " SRC_URI[md5sum] = "e676c65cad5234617ee22f48e328c24e" SRC_URI[sha256sum] = "d4b64c1dde442145a316679acff2df4008aa117ae52dfa3a6bc69efecc7840d1" -- cgit 1.2.3-korg