summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/avahi/files
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-connectivity/avahi/files')
-rw-r--r--meta/recipes-connectivity/avahi/files/fix-CVE-2017-6519.patch48
1 files changed, 48 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/avahi/files/fix-CVE-2017-6519.patch b/meta/recipes-connectivity/avahi/files/fix-CVE-2017-6519.patch
new file mode 100644
index 0000000000..7461fe193d
--- /dev/null
+++ b/meta/recipes-connectivity/avahi/files/fix-CVE-2017-6519.patch
@@ -0,0 +1,48 @@
1Upstream-Status: Backport [https://github.com/lathiat/avahi/commit/e111def]
2
3CVE: CVE-2017-6519
4
5Signed-off-by: Kai Kang <kai.kang@windriver.com>
6
7From e111def44a7df4624a4aa3f85fe98054bffb6b4f Mon Sep 17 00:00:00 2001
8From: Trent Lloyd <trent@lloyd.id.au>
9Date: Sat, 22 Dec 2018 09:06:07 +0800
10Subject: [PATCH] Drop legacy unicast queries from address not on local link
11
12When handling legacy unicast queries, ensure that the source IP is
13inside a subnet on the local link, otherwise drop the packet.
14
15Fixes #145
16Fixes #203
17CVE-2017-6519
18CVE-2018-1000845
19---
20 avahi-core/server.c | 8 ++++++++
21 1 file changed, 8 insertions(+)
22
23diff --git a/avahi-core/server.c b/avahi-core/server.c
24index a2cb19a8..a2580e38 100644
25--- a/avahi-core/server.c
26+++ b/avahi-core/server.c
27@@ -930,6 +930,7 @@ static void dispatch_packet(AvahiServer *s, AvahiDnsPacket *p, const AvahiAddres
28
29 if (avahi_dns_packet_is_query(p)) {
30 int legacy_unicast = 0;
31+ char t[AVAHI_ADDRESS_STR_MAX];
32
33 /* For queries EDNS0 might allow ARCOUNT != 0. We ignore the
34 * AR section completely here, so far. Until the day we add
35@@ -947,6 +948,13 @@ static void dispatch_packet(AvahiServer *s, AvahiDnsPacket *p, const AvahiAddres
36 legacy_unicast = 1;
37 }
38
39+ if (!is_mdns_mcast_address(dst_address) &&
40+ !avahi_interface_address_on_link(i, src_address)) {
41+
42+ 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);
43+ return;
44+ }
45+
46 if (legacy_unicast)
47 reflect_legacy_unicast_query_packet(s, p, i, src_address, port);
48