diff options
Diffstat (limited to 'meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch')
-rw-r--r-- | meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch b/meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch index a1de8e2a5a..85dbded73b 100644 --- a/meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch +++ b/meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch @@ -1,46 +1,46 @@ -From 8cf606779dc356768afc6b70e53f2808a9655143 Mon Sep 17 00:00:00 2001 +From b024ae5749f4aeba03478e6391687c3c9c8dee40 Mon Sep 17 00:00:00 2001 From: Michal Sekletar <msekleta@redhat.com> Date: Thu, 19 Oct 2023 17:36:44 +0200 -Subject: [PATCH] avahi: core: make sure there is rdata to process before - parsing it +Subject: [PATCH] core: make sure there is rdata to process before parsing it Fixes #452 -Upstream-Status: Backport [https://github.com/lathiat/avahi/commit/b024ae5749f4aeba03478e6391687c3c9c8dee40] -CVE: CVE-2023-38472 +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 <meenali.gupta@windriver.com> +Signed-off-by: Vijay Anusuri <vanusuri@mvista.com> --- avahi-client/client-test.c | 3 +++ avahi-daemon/dbus-entry-group.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) -diff --git a/avahi-client/client-test.c b/avahi-client/client-test.c -index 7d04a6a..57750a4 100644 ---- a/avahi-client/client-test.c -+++ b/avahi-client/client-test.c -@@ -258,6 +258,9 @@ int main (AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) { - 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)); - +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"); -diff --git a/avahi-daemon/dbus-entry-group.c b/avahi-daemon/dbus-entry-group.c -index 4e879a5..aa23d4b 100644 ---- a/avahi-daemon/dbus-entry-group.c -+++ b/avahi-daemon/dbus-entry-group.c -@@ -340,7 +340,7 @@ DBusHandlerResult avahi_dbus_msg_entry_group_impl(DBusConnection *c, DBusMessage +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); } --- -2.40.0 |