From b024ae5749f4aeba03478e6391687c3c9c8dee40 Mon Sep 17 00:00:00 2001 From: Michal Sekletar Date: Thu, 19 Oct 2023 17:36:44 +0200 Subject: [PATCH] core: make sure there is rdata to process before parsing it Fixes #452 CVE-2023-38472 Upstream-Status: Backport [import from ubuntu https://git.launchpad.net/ubuntu/+source/avahi/tree/debian/patches/CVE-2023-38472.patch?h=ubuntu/jammy-security Upstream commit https://github.com/lathiat/avahi/commit/b024ae5749f4aeba03478e6391687c3c9c8dee40] CVE: CVE-2023-38472 Signed-off-by: Meenali Gupta Signed-off-by: Vijay Anusuri --- avahi-client/client-test.c | 3 +++ avahi-daemon/dbus-entry-group.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) 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 @@ -272,6 +272,9 @@ int main (AVAHI_GCC_UNUSED int argc, AVA assert(error == AVAHI_ERR_INVALID_RECORD); avahi_string_list_free(txt); + error = avahi_entry_group_add_record (group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, "TestX", 0x01, 0x10, 120, "", 0); + assert(error != AVAHI_OK); + 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"); Index: avahi-0.8/avahi-daemon/dbus-entry-group.c =================================================================== --- avahi-0.8.orig/avahi-daemon/dbus-entry-group.c +++ avahi-0.8/avahi-daemon/dbus-entry-group.c @@ -340,7 +340,7 @@ DBusHandlerResult avahi_dbus_msg_entry_g if (!(r = avahi_record_new_full (name, clazz, type, ttl))) return avahi_dbus_respond_error(c, m, AVAHI_ERR_NO_MEMORY, NULL); - if (avahi_rdata_parse (r, rdata, size) < 0) { + if (!rdata || avahi_rdata_parse (r, rdata, size) < 0) { avahi_record_unref (r); return avahi_dbus_respond_error(c, m, AVAHI_ERR_INVALID_RDATA, NULL); }