bind: fix CVE-2020-8625
PATCH 1/1 bind: fix CVE-2020-8625
BIND Operational Notification: Zone journal (.jnl) file incompatibility
Upstream-Status: Backporting [https://downloads.isc.org/isc/bind9/9.16.12/patches/CVE-2020-8625.patch]
CVE: CVE-2020-8625
--- .../bind/bind-9.16.7/CVE-2020-8625.patch | 17 +++++++++++++++++ meta/recipes-connectivity/bind/bind_9.16.7.bb | 1 + 2 files changed, 18 insertions(+) create mode 100644 meta/recipes-connectivity/bind/bind-9.16.7/CVE-2020-8625.patch
meta/recipes-connectivity/bind/bind-9.16.7/CVE-2020-8625.patch new file +17 -0
@@ -0,0 +1,17 @@ +Upstream-Status: Acepted [https://downloads.isc.org/isc/bind9/9.16.12/patches/CVE-2020-8625.patch] +CVE: CVE-2020-8625 +Signed-off-by: Minjae Kim <[email protected]> + +diff --git a/lib/dns/spnego.c b/lib/dns/spnego.c +index e61d1c600f2..753dc8049fa 100644 +--- a/lib/dns/spnego.c ++++ b/lib/dns/spnego.c +@@ -848,7 +848,7 @@ der_get_oid(const unsigned char *p, size_t len, oid *data, size_t *size) { + return (ASN1_OVERRUN); + } + +- data->components = malloc(len * sizeof(*data->components)); ++ data->components = malloc((len + 1) * sizeof(*data->components)); + if (data->components == NULL) { + return (ENOMEM); + }
meta/recipes-connectivity/bind/bind_9.16.7.bb +1 -0
@@ -17,6 +17,7 @@ SRC_URI = "https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.xz \ file://bind-ensure-searching-for-json-headers-searches-sysr.patch \ file://0001-named-lwresd-V-and-start-log-hide-build-options.patch \ file://0001-avoid-start-failure-with-bind-user.patch \ + file://CVE-2020-8625.patch \ " SRC_URI[sha256sum] = "9f7d1812ebbd26a699f62b6fa8522d5dec57e4bf43af0042a0d60d39ed8314d1"
Signature · 1 line
2.24.3 (Apple Git-128)
Hello
Quoted 6 lines · Minjae Kim
BIND Operational Notification: Zone journal (.jnl) file incompatibility
Upstream-Status: Backporting [
https://downloads.isc.org/isc/bind9/9.16.12/patches/CVE-2020-8625.patch
]
CVE: CVE-2020-8625
This failed while applying:
ERROR: bind-9.16.7-r0 do_patch: Command Error: 'quilt --quiltrc /home/pokybuild/yocto-worker/musl-qemux86- 64/build/build/tmp/work/core2-64-poky-linux-musl/bind/9.16.7-r0/recipe- sysroot-native/etc/quiltrc push' exited with 0 Output:
stdout: Applying patch CVE-2020-8625.patch
patching file lib/dns/spnego.c
Hunk #1 FAILED at 848.
1 out of 1 hunk FAILED -- rejects in file lib/dns/spnego.c Patch CVE-2020-8625.patch does not apply (enforce with -f)
Thanks,
Anuj
Quoted 57 lines
Signed-off-by Minjae Kim <[email protected]>---
.../bind/bind-9.16.7/CVE-2020-8625.patch | 17 +++++++++++++++++ meta/recipes-connectivity/bind/bind_9.16.7.bb | 1 +2 files changed, 18 insertions(+)create mode 100644 meta/recipes-connectivity/bind/bind-9.16.7/CVE- 2020-8625.patch
(quoted diff) +0
-08625.patch b/meta/recipes-connectivity/bind/bind-9.16.7/CVE-2020- 8625.patch
new file mode 100644
index 0000000000..b0b51e7030meta/recipes-connectivity/bind/bind-9.16.7/CVE-2020-8625.patch new file +1
-0@@ -0,0 +1,17 @@ +Upstream-Status: Acepted [https://downloads.isc.org/isc/bind9/9.16.12/patches/CVE-2020-8625.patch
]meta/recipes-connectivity/bind/bind-9.16.7/CVE-2020-8625.patch new file +8
-0+CVE: CVE-2020-8625 +Signed-off-by: Minjae Kim <[email protected]> + +diff --git a/lib/dns/spnego.c b/lib/dns/spnego.c +index e61d1c600f2..753dc8049fa 100644 +--- a/lib/dns/spnego.c ++++ b/lib/dns/spnego.c +@@ -848,7 +848,7 @@ der_get_oid(const unsigned char *p, size_t len,oid *data,
size_t*size) {
+ return (ASN1_OVERRUN);
+ }
+
+-data->components=malloc(len * sizeof(*data->components)); ++data->components= malloc((len + 1) * sizeof(*data-Quoted 1 line
components));
+ if (
data->components== NULL) {
+ return (ENOMEM);
+ }meta/recipes-connectivity/bind/bind_9.16.7.bb +0
-0@@ -17,6 +17,7 @@ SRC_URI = " https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.xz \file://bind-ensure-searching-for-json-headers-searches-sysr.patch \
file://0001-named-lwresd-V-and-start-log-hide-build-options.patch \
file://0001-avoid-start-failure-with-bind-user.patch \
+ file://CVE-2020-8625.patch \
"
SRC_URI[sha256sum] = "9f7d1812ebbd26a699f62b6fa8522d5dec57e4bf43af0042a0d60d39ed8314d1"