mirror of
https://git.yoctoproject.org/poky
synced 2026-05-01 06:32:11 +02:00
3562768af7
import patches from ubuntu to fix CVE-2023-1981 CVE-2023-38469-2 CVE-2023-38470-2 CVE-2023-38471-2 Upstream-Status: Backport [import from ubuntu https://git.launchpad.net/ubuntu/+source/avahi/tree/debian/patches?h=ubuntu/jammy-security Upstream commita2696da2f2&c6cab87df2&94cb648911&b675f70739] Ref: https://git.openembedded.org/openembedded-core-contrib/commit/?h=stable/nanbield-nut&id=a9203c46cd64c3ec5e5b00e381bbac85733f85df (From OE-Core rev: 32c0a3dc4d65065639260e77783dc427d4b1cfe3) Signed-off-by: Vijay Anusuri <vanusuri@mvista.com> Signed-off-by: Steve Sakoman <steve@sakoman.com>
47 lines
2.1 KiB
Diff
47 lines
2.1 KiB
Diff
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] 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 <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(-)
|
|
|
|
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);
|
|
}
|