mirror of
https://git.openwrt.org/feed/packages.git
synced 2024-06-15 20:03:57 +02:00
779af4d40c
Imported patches included in debian and other package. * 200-Fix-NULL-pointer-crashes-from-175.patch CVE-2021-3502 A flaw was found in avahi 0.8-5. A reachable assertion is present in avahi_s_host_name_resolver_start function allowing a local attacker to crash the avahi service by requesting hostname resolutions through the avahi socket or dbus methods for invalid hostnames. The highest threat from this vulnerability is to the service availability. * 201-Avoid-infinite-loop-in-avahi-daemon-by-handling-HUP-event.patch CVE-2021-3468 A flaw was found in avahi in versions 0.6 up to 0.8. The event used to signal the termination of the client connection on the avahi Unix socket is not correctly handled in the client_work function, allowing a local attacker to trigger an infinite loop. The highest threat from this vulnerability is to the availability of the avahi service, which becomes unresponsive after this flaw is triggered. * 202-avahi_dns_packet_consume_uint32-fix-potential-undefined-b.patch avahi_dns_packet_consume_uint32 left shifts uint8_t values by 8, 16 and 24 bits to combine them into a 32-bit value. This produces an undefined behavior warning with gcc -fsanitize when fed input values of 128 or 255 however in testing no actual unexpected behavior occurs in practice and the 32-bit uint32_t is always correctly produced as the final value is immediately stored into a uint32_t and the compiler appears to handle this "correctly". Cast the intermediate values to uint32_t to prevent this warning and ensure the intended result is explicit. * 203-Do-not-disable-timeout-cleanup-on-watch-cleanup.patch This was causing timeouts to never be removed from the linked list that tracks them, resulting in both memory and CPU usage to grow larger over time. * 204-Emit-error-if-requested-service-is-not-found.patch It currently just crashes instead of replying with error. Check return value and emit error instead of passing NULL pointer to reply. * 205-conf-file-line-lengths.patch Allow avahi-daemon.conf file to have lines longer than 256 characters (new limit 1024). Signed-off-by: Hirokazu MORIKAWA <morikw2@gmail.com>
55 lines
1.7 KiB
Diff
55 lines
1.7 KiB
Diff
From: =?utf-8?b?UGV0ciBNZW7FocOtaw==?= <pemensik@redhat.com>
|
|
Date: Thu, 17 Nov 2022 01:51:53 +0100
|
|
Subject: Emit error if requested service is not found
|
|
|
|
It currently just crashes instead of replying with error. Check return
|
|
value and emit error instead of passing NULL pointer to reply.
|
|
|
|
Fixes #375
|
|
|
|
(cherry picked from commit a2696da2f2c50ac43b6c4903f72290d5c3fa9f6f)
|
|
---
|
|
avahi-daemon/dbus-protocol.c | 20 ++++++++++++++------
|
|
1 file changed, 14 insertions(+), 6 deletions(-)
|
|
|
|
--- a/avahi-daemon/dbus-protocol.c
|
|
+++ b/avahi-daemon/dbus-protocol.c
|
|
@@ -375,10 +375,14 @@ static DBusHandlerResult dbus_get_altern
|
|
}
|
|
|
|
t = avahi_alternative_host_name(n);
|
|
- avahi_dbus_respond_string(c, m, t);
|
|
- avahi_free(t);
|
|
-
|
|
- return DBUS_HANDLER_RESULT_HANDLED;
|
|
+ if (t) {
|
|
+ avahi_dbus_respond_string(c, m, t);
|
|
+ avahi_free(t);
|
|
+
|
|
+ return DBUS_HANDLER_RESULT_HANDLED;
|
|
+ } else {
|
|
+ return avahi_dbus_respond_error(c, m, AVAHI_ERR_NOT_FOUND, "Hostname not found");
|
|
+ }
|
|
}
|
|
|
|
static DBusHandlerResult dbus_get_alternative_service_name(DBusConnection *c, DBusMessage *m, DBusError *error) {
|
|
@@ -389,10 +393,14 @@ static DBusHandlerResult dbus_get_altern
|
|
}
|
|
|
|
t = avahi_alternative_service_name(n);
|
|
- avahi_dbus_respond_string(c, m, t);
|
|
- avahi_free(t);
|
|
-
|
|
- return DBUS_HANDLER_RESULT_HANDLED;
|
|
+ if (t) {
|
|
+ avahi_dbus_respond_string(c, m, t);
|
|
+ avahi_free(t);
|
|
+
|
|
+ return DBUS_HANDLER_RESULT_HANDLED;
|
|
+ } else {
|
|
+ return avahi_dbus_respond_error(c, m, AVAHI_ERR_NOT_FOUND, "Service not found");
|
|
+ }
|
|
}
|
|
|
|
static DBusHandlerResult dbus_create_new_entry_group(DBusConnection *c, DBusMessage *m, DBusError *error) {
|