avahi: patch CVE-2025-68471

(From OE-Core rev: 1786f154563c68739d7dc306b0e332d058ccd3f0)

Signed-off-by: Amaury Couderc <amaury.couderc@est.tech>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 5ec4156330c765bc52dbce28dbba6def9868d30f)
Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
Signed-off-by: Peter Marko <peter.marko@siemens.com>
Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
Signed-off-by: Paul Barker <paul@pbarker.dev>
This commit is contained in:
Amaury Couderc
2026-02-20 20:11:31 +01:00
committed by Paul Barker
parent 8b83d6e2f9
commit e7763a1e0a
2 changed files with 37 additions and 0 deletions

View File

@@ -39,6 +39,7 @@ SRC_URI = "https://github.com/lathiat/avahi/releases/download/v${PV}/avahi-${PV}
file://CVE-2024-52615.patch \
file://CVE-2025-68276.patch \
file://CVE-2025-68468.patch \
file://CVE-2025-68471.patch \
"
UPSTREAM_CHECK_URI = "https://github.com/lathiat/avahi/releases/"

View File

@@ -0,0 +1,36 @@
From 4e84c1d6eb2f54d1643bd7ce62817c722ca36d25 Mon Sep 17 00:00:00 2001
From: Hugo Muis <198191869+friendlyhugo@users.noreply.github.com>
Date: Sun, 2 Mar 2025 18:06:24 +0100
Subject: [PATCH] core: fix DoS bug by changing assert to return
Closes https://github.com/avahi/avahi/issues/678
CVE: CVE-2025-68471
Upstream-Status: Backport
[https://github.com/avahi/avahi/commit/9c6eb53bf2e290aed84b1f207e3ce35c54cc0aa1]
Signed-off-by: Amaury Couderc <amaury.couderc@est.tech>
---
avahi-core/browse.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/avahi-core/browse.c b/avahi-core/browse.c
index 2941e57..86e4432 100644
--- a/avahi-core/browse.c
+++ b/avahi-core/browse.c
@@ -320,7 +320,10 @@ static int lookup_start(AvahiSRBLookup *l) {
assert(l);
assert(!(l->flags & AVAHI_LOOKUP_USE_WIDE_AREA) != !(l->flags & AVAHI_LOOKUP_USE_MULTICAST));
- assert(!l->wide_area && !l->multicast);
+ if (l->wide_area || l->multicast) {
+ /* Avoid starting a duplicate lookup */
+ return 0;
+ }
if (l->flags & AVAHI_LOOKUP_USE_WIDE_AREA) {
--
2.43.0