From cab1c581ab9b89075223a90193bec300fae6bce7 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Mar 31 2020 09:35:27 +0000 Subject: import avahi-0.6.31-20.el7 --- diff --git a/SOURCES/0014-don-t-respond-to-unicast-queries-outside-of-local-network.patch b/SOURCES/0014-don-t-respond-to-unicast-queries-outside-of-local-network.patch new file mode 100644 index 0000000..e5b13e0 --- /dev/null +++ b/SOURCES/0014-don-t-respond-to-unicast-queries-outside-of-local-network.patch @@ -0,0 +1,42 @@ +From e111def44a7df4624a4aa3f85fe98054bffb6b4f Mon Sep 17 00:00:00 2001 +From: Trent Lloyd +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-100084 +--- + 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); + diff --git a/SPECS/avahi.spec b/SPECS/avahi.spec index 97c4c5e..00d2361 100644 --- a/SPECS/avahi.spec +++ b/SPECS/avahi.spec @@ -12,7 +12,7 @@ Name: avahi Version: 0.6.31 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Local network service discovery License: LGPLv2+ URL: http://avahi.org @@ -74,6 +74,7 @@ Patch0010: 0010-avahi-ui-Replace-usage-of-deprecated-GTK-Stock-Items.patc Patch0011: 0011-avahi-ui-replace-gtk_vbox_new-with-gtk_box_new-for-G.patch Patch0012: 0012-avahi-ui-Cannot-use-g_object_unref-to-free-GdkCursor.patch Patch0013: 0013-avahi-ui-Remove-deprecated-usage-of-gtk_widget_push_.patch +Patch0014: 0014-don-t-respond-to-unicast-queries-outside-of-local-network.patch # due to FTBFS caused by Gtk changes introduced in RHEL-7.2 Patch1000: avahi-0.6.31-no-deprecations.patch @@ -666,6 +667,9 @@ fi %endif %changelog +* Thu Oct 24 2019 Jan Macku - 0.6.31-20 +- multicast DNS no longer responds to unicast queries outside of local network (#1663410) + * Thu Nov 09 2017 Michal Sekletar - 0.6.31-19 - exclude avahi-discover from avahi-tools package (#1421229)