diff options
author | Vijay Anusuri <vanusuri@mvista.com> | 2023-11-22 13:29:23 +0530 |
---|---|---|
committer | Steve Sakoman <steve@sakoman.com> | 2023-12-01 04:14:19 -1000 |
commit | 716693ccccb82ad398ff7470c360d047baeaec07 (patch) | |
tree | 2206f3cebfe9d81f2d0f2ccf449f33a50c7d6901 /meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch | |
parent | 8cabed090e84c5b4d0511bfced2ace49d9949e4c (diff) | |
download | poky-716693ccccb82ad398ff7470c360d047baeaec07.tar.gz |
avahi: backport Debian patches to fix multiple CVE's
import patches from ubuntu to fix
CVE-2023-1981
CVE-2023-38469
CVE-2023-38470
CVE-2023-38471
CVE-2023-38472
CVE-2023-38473
Upstream-Status: Backport [import from ubuntu https://git.launchpad.net/ubuntu/+source/avahi/tree/debian/patches?h=ubuntu/focal-security
Upstream commit
https://github.com/lathiat/avahi/commit/a2696da2f2c50ac43b6c4903f72290d5c3fa9f6f
&
https://github.com/lathiat/avahi/commit/a337a1ba7d15853fb56deef1f464529af6e3a1cf
&
https://github.com/lathiat/avahi/commit/c6cab87df290448a63323c8ca759baa516166237
&
https://github.com/lathiat/avahi/commit/94cb6489114636940ac683515417990b55b5d66c
&
https://github.com/lathiat/avahi/commit/20dec84b2480821704258bc908e7b2bd2e883b24
&
https://github.com/lathiat/avahi/commit/894f085f402e023a98cbb6f5a3d117bd88d93b09
&
https://github.com/lathiat/avahi/commit/b675f70739f404342f7f78635d6e2dcd85a13460
&
https://github.com/lathiat/avahi/commit/b024ae5749f4aeba03478e6391687c3c9c8dee40
&
https://github.com/lathiat/avahi/commit/b448c9f771bada14ae8de175695a9729f8646797]
(From OE-Core rev: 4771e335cd4d95e734d7f07a718319f4543ce2f1)
Signed-off-by: Vijay Anusuri <vanusuri@mvista.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch')
-rw-r--r-- | meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch b/meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch new file mode 100644 index 0000000000..f49d990a42 --- /dev/null +++ b/meta/recipes-connectivity/avahi/files/CVE-2023-38472.patch | |||
@@ -0,0 +1,45 @@ | |||
1 | From b024ae5749f4aeba03478e6391687c3c9c8dee40 Mon Sep 17 00:00:00 2001 | ||
2 | From: Michal Sekletar <msekleta@redhat.com> | ||
3 | Date: Thu, 19 Oct 2023 17:36:44 +0200 | ||
4 | Subject: [PATCH] core: make sure there is rdata to process before parsing it | ||
5 | |||
6 | Fixes #452 | ||
7 | |||
8 | CVE-2023-38472 | ||
9 | |||
10 | Upstream-Status: Backport [import from ubuntu https://git.launchpad.net/ubuntu/+source/avahi/tree/debian/patches/CVE-2023-38472.patch?h=ubuntu/focal-security | ||
11 | Upstream commit https://github.com/lathiat/avahi/commit/b024ae5749f4aeba03478e6391687c3c9c8dee40] | ||
12 | CVE: CVE-2023-38472 | ||
13 | Signed-off-by: Vijay Anusuri <vanusuri@mvista.com> | ||
14 | --- | ||
15 | avahi-client/client-test.c | 3 +++ | ||
16 | avahi-daemon/dbus-entry-group.c | 2 +- | ||
17 | 2 files changed, 4 insertions(+), 1 deletion(-) | ||
18 | |||
19 | Index: avahi-0.7/avahi-client/client-test.c | ||
20 | =================================================================== | ||
21 | --- avahi-0.7.orig/avahi-client/client-test.c | ||
22 | +++ avahi-0.7/avahi-client/client-test.c | ||
23 | @@ -272,6 +272,9 @@ int main (AVAHI_GCC_UNUSED int argc, AVA | ||
24 | assert(error == AVAHI_ERR_INVALID_RECORD); | ||
25 | avahi_string_list_free(txt); | ||
26 | |||
27 | + error = avahi_entry_group_add_record (group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, "TestX", 0x01, 0x10, 120, "", 0); | ||
28 | + assert(error != AVAHI_OK); | ||
29 | + | ||
30 | avahi_entry_group_commit (group); | ||
31 | |||
32 | domain = avahi_domain_browser_new (avahi, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, NULL, AVAHI_DOMAIN_BROWSER_BROWSE, 0, avahi_domain_browser_callback, (char*) "omghai3u"); | ||
33 | Index: avahi-0.7/avahi-daemon/dbus-entry-group.c | ||
34 | =================================================================== | ||
35 | --- avahi-0.7.orig/avahi-daemon/dbus-entry-group.c | ||
36 | +++ avahi-0.7/avahi-daemon/dbus-entry-group.c | ||
37 | @@ -340,7 +340,7 @@ DBusHandlerResult avahi_dbus_msg_entry_g | ||
38 | if (!(r = avahi_record_new_full (name, clazz, type, ttl))) | ||
39 | return avahi_dbus_respond_error(c, m, AVAHI_ERR_NO_MEMORY, NULL); | ||
40 | |||
41 | - if (avahi_rdata_parse (r, rdata, size) < 0) { | ||
42 | + if (!rdata || avahi_rdata_parse (r, rdata, size) < 0) { | ||
43 | avahi_record_unref (r); | ||
44 | return avahi_dbus_respond_error(c, m, AVAHI_ERR_INVALID_RDATA, NULL); | ||
45 | } | ||