| 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] 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 |
| |
| Canonical notes: |
| nickgalanis> removed first hunk since there is no .github dir in this release |
| |
| Upstream-Status: Backport [import from ubuntu https://git.launchpad.net/ubuntu/+source/avahi/tree/debian/patches/CVE-2023-38469-2.patch?h=ubuntu/jammy-security |
| Upstream commit https://github.com/lathiat/avahi/commit/c6cab87df290448a63323c8ca759baa516166237] |
| CVE: CVE-2023-38469 |
| Signed-off-by: Vijay Anusuri <vanusuri@mvista.com> |
| --- |
| avahi-client/client-test.c | 14 ++++++++++++++ |
| 1 files changed, 14 insertions(+) |
| |
| Index: avahi-0.8/avahi-client/client-test.c |
| =================================================================== |
| --- avahi-0.8.orig/avahi-client/client-test.c |
| +++ avahi-0.8/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, AVA |
| 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); |
| @@ -258,6 +264,14 @@ int main (AVAHI_GCC_UNUSED int argc, AVA |
| printf("%s\n", avahi_strerror(avahi_entry_group_add_service (group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, "Lathiat's Site", "_http._tcp", NULL, NULL, 80, "foo=bar", NULL))); |
| printf("add_record: %d\n", avahi_entry_group_add_record (group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, "TestX", 0x01, 0x10, 120, "\5booya", 6)); |
| |
| + 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"); |