Dominique Leuenberger
88caf96f1d
- Add avahi-CVE-2023-38472.patch: Fix reachable assertion in avahi_rdata_parse (bsc#1216853, CVE-2023-38472). OBS-URL: https://build.opensuse.org/request/show/1129882 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=235
46 lines
2.6 KiB
Diff
46 lines
2.6 KiB
Diff
diff --unified --recursive --text --new-file --color avahi-0.8.old/avahi-client/client-test.c avahi-0.8.new/avahi-client/client-test.c
|
|
--- avahi-0.8.old/avahi-client/client-test.c 2015-04-01 12:58:14.145727222 +0800
|
|
+++ avahi-0.8.new/avahi-client/client-test.c 2023-11-30 13:20:12.640085338 +0800
|
|
@@ -258,6 +258,9 @@
|
|
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));
|
|
|
|
+ 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 --unified --recursive --text --new-file --color avahi-0.8.old/avahi-core/rr.c avahi-0.8.new/avahi-core/rr.c
|
|
--- avahi-0.8.old/avahi-core/rr.c 2015-04-01 12:58:14.149727123 +0800
|
|
+++ avahi-0.8.new/avahi-core/rr.c 2023-11-30 13:20:57.120063792 +0800
|
|
@@ -426,6 +426,7 @@
|
|
copy->ref = 1;
|
|
copy->key = avahi_key_ref(r->key);
|
|
copy->ttl = r->ttl;
|
|
+ memset(©->data, 0, sizeof(copy->data));
|
|
|
|
switch (r->key->type) {
|
|
case AVAHI_DNS_TYPE_PTR:
|
|
@@ -466,7 +467,7 @@
|
|
break;
|
|
|
|
default:
|
|
- if (!(copy->data.generic.data = avahi_memdup(r->data.generic.data, r->data.generic.size)))
|
|
+ if (r->data.generic.size && !(copy->data.generic.data = avahi_memdup(r->data.generic.data, r->data.generic.size)))
|
|
goto fail;
|
|
copy->data.generic.size = r->data.generic.size;
|
|
break;
|
|
diff --unified --recursive --text --new-file --color avahi-0.8.old/avahi-daemon/dbus-entry-group.c avahi-0.8.new/avahi-daemon/dbus-entry-group.c
|
|
--- avahi-0.8.old/avahi-daemon/dbus-entry-group.c 2015-04-01 12:58:14.153727024 +0800
|
|
+++ avahi-0.8.new/avahi-daemon/dbus-entry-group.c 2023-11-30 13:20:12.640085338 +0800
|
|
@@ -340,7 +340,7 @@
|
|
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);
|
|
}
|