Merge pull request #298069 from muggenhor/fix/avahi-handle-bogus-services-gracefully
Fix/avahi handle bogus services gracefully
This commit is contained in:
commit
02d746d6c3
|
@ -1,102 +0,0 @@
|
||||||
From a337a1ba7d15853fb56deef1f464529af6e3a1cf Mon Sep 17 00:00:00 2001
|
|
||||||
From: Evgeny Vereshchagin <evvers@ya.ru>
|
|
||||||
Date: Mon, 23 Oct 2023 20:29:31 +0000
|
|
||||||
Subject: [PATCH 1/2] core: reject overly long TXT resource records
|
|
||||||
|
|
||||||
Closes https://github.com/lathiat/avahi/issues/455
|
|
||||||
|
|
||||||
CVE-2023-38469
|
|
||||||
---
|
|
||||||
avahi-core/rr.c | 9 ++++++++-
|
|
||||||
1 file changed, 8 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/avahi-core/rr.c b/avahi-core/rr.c
|
|
||||||
index 2bb89244..9c04ebbd 100644
|
|
||||||
--- a/avahi-core/rr.c
|
|
||||||
+++ b/avahi-core/rr.c
|
|
||||||
@@ -32,6 +32,7 @@
|
|
||||||
#include <avahi-common/malloc.h>
|
|
||||||
#include <avahi-common/defs.h>
|
|
||||||
|
|
||||||
+#include "dns.h"
|
|
||||||
#include "rr.h"
|
|
||||||
#include "log.h"
|
|
||||||
#include "util.h"
|
|
||||||
@@ -689,11 +690,17 @@ int avahi_record_is_valid(AvahiRecord *r) {
|
|
||||||
case AVAHI_DNS_TYPE_TXT: {
|
|
||||||
|
|
||||||
AvahiStringList *strlst;
|
|
||||||
+ size_t used = 0;
|
|
||||||
|
|
||||||
- for (strlst = r->data.txt.string_list; strlst; strlst = strlst->next)
|
|
||||||
+ for (strlst = r->data.txt.string_list; strlst; strlst = strlst->next) {
|
|
||||||
if (strlst->size > 255 || strlst->size <= 0)
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
+ used += 1+strlst->size;
|
|
||||||
+ if (used > AVAHI_DNS_RDATA_MAX)
|
|
||||||
+ return 0;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
From c6cab87df290448a63323c8ca759baa516166237 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Evgeny Vereshchagin <evvers@ya.ru>
|
|
||||||
Date: Wed, 25 Oct 2023 18:15:42 +0000
|
|
||||||
Subject: [PATCH 2/2] tests: pass overly long TXT resource records
|
|
||||||
|
|
||||||
to make sure they don't crash avahi any more.
|
|
||||||
|
|
||||||
It reproduces https://github.com/lathiat/avahi/issues/455
|
|
||||||
---
|
|
||||||
avahi-client/client-test.c | 14 ++++++++++++++
|
|
||||||
2 files changed, 20 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/avahi-client/client-test.c b/avahi-client/client-test.c
|
|
||||||
index ba979988..da0e43ad 100644
|
|
||||||
--- a/avahi-client/client-test.c
|
|
||||||
+++ b/avahi-client/client-test.c
|
|
||||||
@@ -22,6 +22,7 @@
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <stdio.h>
|
|
||||||
+#include <string.h>
|
|
||||||
#include <assert.h>
|
|
||||||
|
|
||||||
#include <avahi-client/client.h>
|
|
||||||
@@ -33,6 +34,8 @@
|
|
||||||
#include <avahi-common/malloc.h>
|
|
||||||
#include <avahi-common/timeval.h>
|
|
||||||
|
|
||||||
+#include <avahi-core/dns.h>
|
|
||||||
+
|
|
||||||
static const AvahiPoll *poll_api = NULL;
|
|
||||||
static AvahiSimplePoll *simple_poll = NULL;
|
|
||||||
|
|
||||||
@@ -222,6 +225,9 @@ int main (AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) {
|
|
||||||
uint32_t cookie;
|
|
||||||
struct timeval tv;
|
|
||||||
AvahiAddress a;
|
|
||||||
+ uint8_t rdata[AVAHI_DNS_RDATA_MAX+1];
|
|
||||||
+ AvahiStringList *txt = NULL;
|
|
||||||
+ int r;
|
|
||||||
|
|
||||||
simple_poll = avahi_simple_poll_new();
|
|
||||||
poll_api = avahi_simple_poll_get(simple_poll);
|
|
||||||
@@ -261,6 +267,14 @@ int main (AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) {
|
|
||||||
error = avahi_entry_group_add_record (group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, "TestX", 0x01, 0x10, 120, "", 0);
|
|
||||||
assert(error != AVAHI_OK);
|
|
||||||
|
|
||||||
+ memset(rdata, 1, sizeof(rdata));
|
|
||||||
+ r = avahi_string_list_parse(rdata, sizeof(rdata), &txt);
|
|
||||||
+ assert(r >= 0);
|
|
||||||
+ assert(avahi_string_list_serialize(txt, NULL, 0) == sizeof(rdata));
|
|
||||||
+ error = avahi_entry_group_add_service_strlst(group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, "TestX", "_qotd._tcp", NULL, NULL, 123, txt);
|
|
||||||
+ assert(error == AVAHI_ERR_INVALID_RECORD);
|
|
||||||
+ avahi_string_list_free(txt);
|
|
||||||
+
|
|
||||||
avahi_entry_group_commit (group);
|
|
||||||
|
|
||||||
domain = avahi_domain_browser_new (avahi, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, NULL, AVAHI_DOMAIN_BROWSER_BROWSE, 0, avahi_domain_browser_callback, (char*) "omghai3u");
|
|
|
@ -1,47 +0,0 @@
|
||||||
From 04ac71fd56a16365360f14bd4691219913e22f21 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Evgeny Vereshchagin <evvers@ya.ru>
|
|
||||||
Date: Tue, 24 Oct 2023 21:57:32 +0000
|
|
||||||
Subject: [PATCH 1/2] smoke-test: call SetHostName with unusual names
|
|
||||||
|
|
||||||
It's prompted by https://github.com/lathiat/avahi/issues/453
|
|
||||||
---
|
|
||||||
avahi-core/server.c | 9 ++++++---
|
|
||||||
1 file changed, 6 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/avahi-core/server.c b/avahi-core/server.c
|
|
||||||
index f6a21bb7..84df6b5d 100644
|
|
||||||
--- a/avahi-core/server.c
|
|
||||||
+++ b/avahi-core/server.c
|
|
||||||
@@ -1309,10 +1309,13 @@ int avahi_server_set_host_name(AvahiServer *s, const char *host_name) {
|
|
||||||
else
|
|
||||||
hn = avahi_normalize_name_strdup(host_name);
|
|
||||||
|
|
||||||
+ if (!hn)
|
|
||||||
+ return avahi_server_set_errno(s, AVAHI_ERR_NO_MEMORY);
|
|
||||||
+
|
|
||||||
h = hn;
|
|
||||||
if (!avahi_unescape_label((const char **)&hn, label, sizeof(label))) {
|
|
||||||
avahi_free(h);
|
|
||||||
- return AVAHI_ERR_INVALID_HOST_NAME;
|
|
||||||
+ return avahi_server_set_errno(s, AVAHI_ERR_INVALID_HOST_NAME);
|
|
||||||
}
|
|
||||||
|
|
||||||
avahi_free(h);
|
|
||||||
@@ -1320,7 +1323,7 @@ int avahi_server_set_host_name(AvahiServer *s, const char *host_name) {
|
|
||||||
h = label_escaped;
|
|
||||||
len = sizeof(label_escaped);
|
|
||||||
if (!avahi_escape_label(label, strlen(label), &h, &len))
|
|
||||||
- return AVAHI_ERR_INVALID_HOST_NAME;
|
|
||||||
+ return avahi_server_set_errno(s, AVAHI_ERR_INVALID_HOST_NAME);
|
|
||||||
|
|
||||||
if (avahi_domain_equal(s->host_name, label_escaped) && s->state != AVAHI_SERVER_COLLISION)
|
|
||||||
return avahi_server_set_errno(s, AVAHI_ERR_NO_CHANGE);
|
|
||||||
@@ -1330,7 +1333,7 @@ int avahi_server_set_host_name(AvahiServer *s, const char *host_name) {
|
|
||||||
avahi_free(s->host_name);
|
|
||||||
s->host_name = avahi_strdup(label_escaped);
|
|
||||||
if (!s->host_name)
|
|
||||||
- return AVAHI_ERR_NO_MEMORY;
|
|
||||||
+ return avahi_server_set_errno(s, AVAHI_ERR_NO_MEMORY);
|
|
||||||
|
|
||||||
update_fqdn(s);
|
|
||||||
|
|
|
@ -57,6 +57,12 @@ stdenv.mkDerivation rec {
|
||||||
url = "https://github.com/lathiat/avahi/commit/94cb6489114636940ac683515417990b55b5d66c.patch";
|
url = "https://github.com/lathiat/avahi/commit/94cb6489114636940ac683515417990b55b5d66c.patch";
|
||||||
sha256 = "sha256-Fanh9bvz+uknr5pAmltqijuUAZIG39JR2Lyq5zGKJ58=";
|
sha256 = "sha256-Fanh9bvz+uknr5pAmltqijuUAZIG39JR2Lyq5zGKJ58=";
|
||||||
})
|
})
|
||||||
|
# https://github.com/avahi/avahi/pull/480 merged Sept 19
|
||||||
|
(fetchpatch {
|
||||||
|
name = "bail-out-unless-escaped-labels-fit.patch";
|
||||||
|
url = "https://github.com/avahi/avahi/commit/20dec84b2480821704258bc908e7b2bd2e883b24.patch";
|
||||||
|
sha256 = "sha256-p/dOuQ/GInIcUwuFhQR3mGc5YBL5J8ho+1gvzcqEN0c=";
|
||||||
|
})
|
||||||
# CVE-2023-38473
|
# CVE-2023-38473
|
||||||
# https://github.com/lathiat/avahi/pull/486 merged Oct 18
|
# https://github.com/lathiat/avahi/pull/486 merged Oct 18
|
||||||
(fetchpatch {
|
(fetchpatch {
|
||||||
|
@ -79,12 +85,39 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "sha256-4dG+5ZHDa+A4/CszYS8uXWlpmA89m7/jhbZ7rheMs7U=";
|
sha256 = "sha256-4dG+5ZHDa+A4/CszYS8uXWlpmA89m7/jhbZ7rheMs7U=";
|
||||||
})
|
})
|
||||||
# https://github.com/lathiat/avahi/pull/499 merged Oct 25
|
# https://github.com/lathiat/avahi/pull/499 merged Oct 25
|
||||||
# (but with the changes to '.github/workflows/smoke-tests.sh removed)
|
(fetchpatch {
|
||||||
./CVE-2023-38471-2.patch
|
name = "CVE-2023-38471-2.patch";
|
||||||
|
url = "https://github.com/avahi/avahi/commit/b675f70739f404342f7f78635d6e2dcd85a13460.patch";
|
||||||
|
sha256 = "sha256-uDtMPWuz1lsu7n0Co/Gpyh369miQ6GWGyC0UPQB/yI8=";
|
||||||
|
})
|
||||||
# CVE-2023-38469
|
# CVE-2023-38469
|
||||||
# https://github.com/lathiat/avahi/pull/500 merged Oct 25
|
# https://github.com/lathiat/avahi/pull/500 merged Oct 25
|
||||||
# (but with the changes to '.github/workflows/smoke-tests.sh removed)
|
(fetchpatch {
|
||||||
./CVE-2023-38469.patch
|
name = "CVE-2023-38469.patch";
|
||||||
|
url = "https://github.com/avahi/avahi/commit/61b9874ff91dd20a12483db07df29fe7f35db77f.patch";
|
||||||
|
sha256 = "sha256-qR7scfQqhRGxg2n4HQsxVxCLkXbwZi+PlYxrOSEPsL0=";
|
||||||
|
excludes = [ ".github/workflows/smoke-tests.sh" ];
|
||||||
|
})
|
||||||
|
# https://github.com/avahi/avahi/pull/515 merged Nov 3
|
||||||
|
(fetchpatch {
|
||||||
|
name = "fix-compare-rrs-with-zero-length-rdata.patch";
|
||||||
|
url = "https://github.com/avahi/avahi/commit/177d75e8c43be45a8383d794ce4084dd5d600a9e.patch";
|
||||||
|
sha256 = "sha256-uwIyruAWgiWt0yakRrvMdYjjhEhUk5cIGKt6twyXbHw=";
|
||||||
|
})
|
||||||
|
# https://github.com/avahi/avahi/pull/519 merged Nov 8
|
||||||
|
(fetchpatch {
|
||||||
|
name = "reject-non-utf-8-service-names.patch";
|
||||||
|
url = "https://github.com/avahi/avahi/commit/2b6d3e99579e3b6e9619708fad8ad8e07ada8218.patch";
|
||||||
|
sha256 = "sha256-lwSA3eEQgH0g51r0i9/HJMJPRXrhQnTIEDxcYqUuLdI=";
|
||||||
|
excludes = [ "fuzz/fuzz-domain.c" ];
|
||||||
|
})
|
||||||
|
# https://github.com/avahi/avahi/pull/523 merged Nov 12
|
||||||
|
(fetchpatch {
|
||||||
|
name = "core-no-longer-supply-bogus-services-to-callbacks.patch";
|
||||||
|
url = "https://github.com/avahi/avahi/commit/93b14365c1c1e04efd1a890e8caa01a2a514bfd8.patch";
|
||||||
|
sha256 = "sha256-VBm8vsBZkTbbWAK8FI71SL89lZuYd1yFNoB5o+FvlEU=";
|
||||||
|
excludes = [ ".github/workflows/smoke-tests.sh" "fuzz/fuzz-packet.c" ];
|
||||||
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
depsBuildBuild = [
|
depsBuildBuild = [
|
||||||
|
|
Loading…
Reference in New Issue
Block a user