avahi: fix CVE-2017-6519
PATCH 1/2 avahi: fix CVE-2017-6519
From: Kai Kang <[email protected]>
Backport patch to fix CVE-2017-6519.
CVE: CVE-2017-6519
--- meta/recipes-connectivity/avahi/avahi.inc | 4 +- .../avahi/files/fix-CVE-2017-6519.patch | 48 +++++++++++++++++++ 2 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-connectivity/avahi/files/fix-CVE-2017-6519.patch
meta/recipes-connectivity/avahi/avahi.inc +3 -1
@@ -19,7 +19,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \ file://avahi-daemon/main.c;endline=21;md5=9ee77368c5407af77caaef1b07285969 \ file://avahi-client/client.h;endline=23;md5=f4ac741a25c4f434039ba3e18c8674cf" -SRC_URI = "https://github.com/lathiat/avahi/releases/download/v${PV}/avahi-${PV}.tar.gz" +SRC_URI = "https://github.com/lathiat/avahi/releases/download/v${PV}/avahi-${PV}.tar.gz \ + file://fix-CVE-2017-6519.patch \ + " UPSTREAM_CHECK_URI = "https://github.com/lathiat/avahi/releases/" SRC_URI[md5sum] = "d76c59d0882ac6c256d70a2a585362a6"
meta/recipes-connectivity/avahi/files/fix-CVE-2017-6519.patch new file +48 -0
48 lines not on this page · raw message
Signature · 1 line
2.20.0
PATCH 2/2 webkitgtk: 2.22.6 -> 2.22.7
From: Kai Kang <[email protected]>
webkitgtk 2.22.7 is a bug fix release in the stable 2.22 series.
* Fix rendering of glyphs in Hebrew (and possibly other languages) when Unicode NFC normalization is used.
* Fix several crashes and race conditions.
See https://www.webkitgtk.org/2019/03/01/webkitgtk2.22.7-released.html
---
.../webkit/{webkitgtk_2.22.6.bb => webkitgtk_2.22.7.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-sato/webkit/{webkitgtk_2.22.6.bb => webkitgtk_2.22.7.bb} (97%)meta/recipes-sato/webkit/webkitgtk_2.22.7.bb renamed from meta/recipes-sato/webkit/webkitgtk_2.22.6.bb +2 -2
@@ -23,8 +23,8 @@ SRC_URI = "http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ file://bad_optional_access.patch \ " -SRC_URI[md5sum] = "7c21a30f7f078f0b712caf0c7ee966a4" -SRC_URI[sha256sum] = "df90db9c0db0a2072b945fa3e1d45865922bd686c4659cce6cb5897ce357c85b" +SRC_URI[md5sum] = "47386c10a9c3975f933c85404f35ff3b" +SRC_URI[sha256sum] = "4be6f7d605cd0a690fd26e8aa83b089a33ad9d419148eafcfb60580dd2af30ff" inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc
Signature · 1 line
2.20.0
The patch itself says two CVE IDs, so can you put them both in the path header with your SOB please?
Ross
Quoted 91 lines · On Tue, 2 Apr 2019 at 08:45, <[email protected]> wrote:
From: Kai Kang <[email protected]>
Backport patch to fix CVE-2017-6519.
CVE: CVE-2017-6519
Signed-off-by Kai Kang <[email protected]>--- meta/recipes-connectivity/avahi/avahi.inc | 4 +- .../avahi/files/fix-CVE-2017-6519.patch | 48 +++++++++++++++++++ 2 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-connectivity/avahi/files/fix-CVE-2017-6519.patchmeta/recipes-connectivity/avahi/avahi.inc +3
-1@@ -19,7 +19,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \ file://avahi-daemon/main.c;endline=21;md5=9ee77368c5407af77caaef1b07285969 \ file://avahi-client/client.h;endline=23;md5=f4ac741a25c4f434039ba3e18c8674cf" -SRC_URI = "https://github.com/lathiat/avahi/releases/download/v${PV}/avahi-${PV}.tar.gz" +SRC_URI = "https://github.com/lathiat/avahi/releases/download/v${PV}/avahi-${PV}.tar.gz \ + file://fix-CVE-2017-6519.patch \ + " UPSTREAM_CHECK_URI = "https://github.com/lathiat/avahi/releases/" SRC_URI[md5sum] = "d76c59d0882ac6c256d70a2a585362a6"meta/recipes-connectivity/avahi/files/fix-CVE-2017-6519.patch new file +48
-1@@ -0,0 +1,48 @@ +Upstream-Status: Backport [https://github.com/lathiat/avahi/commit/e111def] + +CVE: CVE-2017-6519 + +Signed-off-by: Kai Kang <[email protected]> + +From e111def44a7df4624a4aa3f85fe98054bffb6b4f Mon Sep 17 00:00:00 2001 +From: Trent Lloyd <[email protected]> +Date: Sat, 22 Dec 2018 09:06:07 +0800 +Subject: [PATCH] Drop legacy unicast queries from address not on local link + +When handling legacy unicast queries, ensure that the source IP is +inside a subnet on the local link, otherwise drop the packet. + +Fixes #145 +Fixes #203 +CVE-2017-6519 +CVE-2018-1000845 +--- + avahi-core/server.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/avahi-core/server.c b/avahi-core/server.c +index a2cb19a8..a2580e38 100644 +--- a/avahi-core/server.c ++++ b/avahi-core/server.c +@@ -930,6 +930,7 @@ static void dispatch_packet(AvahiServer *s, AvahiDnsPacket *p, const AvahiAddres + + if (avahi_dns_packet_is_query(p)) { + int legacy_unicast = 0; ++ char t[AVAHI_ADDRESS_STR_MAX]; + + /* For queries EDNS0 might allow ARCOUNT != 0. We ignore the + * AR section completely here, so far. Until the day we add +@@ -947,6 +948,13 @@ static void dispatch_packet(AvahiServer *s, AvahiDnsPacket *p, const AvahiAddres + legacy_unicast = 1; + } + ++ if (!is_mdns_mcast_address(dst_address) && ++ !avahi_interface_address_on_link(i, src_address)) { ++ ++ avahi_log_debug("Received non-local unicast query from host %s on interface '%s.%i'.", avahi_address_snprint(t, sizeof(t), src_address), i->hardware->name, i->protocol); ++ return; ++ } ++ + if (legacy_unicast) + reflect_legacy_unicast_query_packet(s, p, i, src_address, port); + --2.20.0
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Quoted 2 lines · Ross
The patch itself says two CVE IDs, so can you put them both in the path header with your SOB please?
I have checked CVE-2018-1000845 which is rejected that it is duplicate of CVE-2017-6519. That why didn't list CVE-2018-1000845 in patch and commit message.
Regards,
Kai
Quoted 94 lines
Ross
Quoted 90 lines · On Tue, 2 Apr 2019 at 08:45, <[email protected]> wrote:
From: Kai Kang <[email protected]>
Backport patch to fix CVE-2017-6519.
CVE: CVE-2017-6519
Signed-off-by Kai Kang <[email protected]>--- meta/recipes-connectivity/avahi/avahi.inc | 4 +- .../avahi/files/fix-CVE-2017-6519.patch | 48 +++++++++++++++++++ 2 files changed, 51 insertions(+), 1 deletion(-)create mode 100644
meta/recipes-connectivity/avahi/files/fix-CVE-2017-6519.patchmeta/recipes-connectivity/avahi/avahi.inc +3
-1@@ -19,7 +19,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \ file://avahi-daemon/main.c;endline=21;md5=9ee77368c5407af77caaef1b07285969 \ file://avahi-client/client.h;endline=23;md5=f4ac741a25c4f434039ba3e18c8674cf" -SRC_URI = "https://github.com/lathiat/avahi/releases/download/v${PV}/avahi-${PV}.tar.gz" +SRC_URI = "https://github.com/lathiat/avahi/releases/download/v${PV}/avahi-${PV}.tar.gz \ + file://fix-CVE-2017-6519.patch \ + " UPSTREAM_CHECK_URI = "https://github.com/lathiat/avahi/releases/" SRC_URI[md5sum] = "d76c59d0882ac6c256d70a2a585362a6"meta/recipes-connectivity/avahi/files/fix-CVE-2017-6519.patch new file +48
-1@@ -0,0 +1,48 @@ +Upstream-Status: Backport [https://github.com/lathiat/avahi/commit/e111def] + +CVE: CVE-2017-6519 + +Signed-off-by: Kai Kang <[email protected]> + +From e111def44a7df4624a4aa3f85fe98054bffb6b4f Mon Sep 17 00:00:00 2001 +From: Trent Lloyd <[email protected]> +Date: Sat, 22 Dec 2018 09:06:07 +0800 +Subject: [PATCH] Drop legacy unicast queries from address not on local link + +When handling legacy unicast queries, ensure that the source IP is +inside a subnet on the local link, otherwise drop the packet. + +Fixes #145 +Fixes #203 +CVE-2017-6519 +CVE-2018-1000845 +--- + avahi-core/server.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/avahi-core/server.c b/avahi-core/server.c +index a2cb19a8..a2580e38 100644 +--- a/avahi-core/server.c ++++ b/avahi-core/server.c +@@ -930,6 +930,7 @@ static void dispatch_packet(AvahiServer *s, AvahiDnsPacket *p, const AvahiAddres + + if (avahi_dns_packet_is_query(p)) { + int legacy_unicast = 0; ++ char t[AVAHI_ADDRESS_STR_MAX]; + + /* For queries EDNS0 might allow ARCOUNT != 0. We ignore the + * AR section completely here, so far. Until the day we add +@@ -947,6 +948,13 @@ static void dispatch_packet(AvahiServer *s, AvahiDnsPacket *p, const AvahiAddres + legacy_unicast = 1; + } + ++ if (!is_mdns_mcast_address(dst_address) && ++ !avahi_interface_address_on_link(i, src_address)) { ++ ++ avahi_log_debug("Received non-local unicast query from host %s on interface '%s.%i'.", avahi_address_snprint(t, sizeof(t), src_address), i->hardware->name, i->protocol); ++ return; ++ } ++ + if (legacy_unicast) + reflect_legacy_unicast_query_packet(s, p, i, src_address, port); + --2.20.0
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Signature · 1 line
Kai Kang
Quoted 3 lines · Kang Kai
I have checked CVE-2018-1000845 which is rejected that it is duplicate of CVE-2017-6519. That why didn't list CVE-2018-1000845 in patch and commit message.
Okay it's actually been rejected, so tooling shouldn't be seeing it.
Thanks,
Ross