public inbox for openembedded-core@lists.openembedded.org
 help / color / mirror / Atom feed
* [OE-core][scarthgap][PATCH 1/2] avahi: patch CVE-2025-68276
@ 2026-01-25  9:40 ankur.tyagi85
  2026-01-25  9:40 ` [OE-core][scarthgap][PATCH 2/2] avahi: patch CVE-2026-24401 ankur.tyagi85
  2026-02-04 17:40 ` [OE-core][scarthgap][PATCH 1/2] avahi: patch CVE-2025-68276 Yoann Congal
  0 siblings, 2 replies; 5+ messages in thread
From: ankur.tyagi85 @ 2026-01-25  9:40 UTC (permalink / raw)
  To: openembedded-core; +Cc: Ankur Tyagi

From: Ankur Tyagi <ankur.tyagi85@gmail.com>

Backport the patch[1] from the PR[2] mentioned in the nvd[3].

[1] https://github.com/avahi/avahi/commit/2d48e42d44a183f26a4d12d1f5d41abb9b7c6355
[2] https://github.com/avahi/avahi/pull/806
[3] https://nvd.nist.gov/vuln/detail/CVE-2025-68276

Dropped CI changes from the original PR during backport.

Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
---
 meta/recipes-connectivity/avahi/avahi_0.8.bb  |  1 +
 .../avahi/files/CVE-2025-68276.patch          | 65 +++++++++++++++++++
 2 files changed, 66 insertions(+)
 create mode 100644 meta/recipes-connectivity/avahi/files/CVE-2025-68276.patch

diff --git a/meta/recipes-connectivity/avahi/avahi_0.8.bb b/meta/recipes-connectivity/avahi/avahi_0.8.bb
index 7930bd3037..bb20fd17cc 100644
--- a/meta/recipes-connectivity/avahi/avahi_0.8.bb
+++ b/meta/recipes-connectivity/avahi/avahi_0.8.bb
@@ -37,6 +37,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/avahi-${PV}.tar.gz \
            file://CVE-2023-38473.patch \
            file://CVE-2024-52616.patch \
            file://CVE-2024-52615.patch \
+           file://CVE-2025-68276.patch \
            "
 
 GITHUB_BASE_URI = "https://github.com/avahi/avahi/releases/"
diff --git a/meta/recipes-connectivity/avahi/files/CVE-2025-68276.patch b/meta/recipes-connectivity/avahi/files/CVE-2025-68276.patch
new file mode 100644
index 0000000000..75169419f1
--- /dev/null
+++ b/meta/recipes-connectivity/avahi/files/CVE-2025-68276.patch
@@ -0,0 +1,65 @@
+From 8ec85459d8e6e59cc14457e16fb7ba171901f90e Mon Sep 17 00:00:00 2001
+From: Evgeny Vereshchagin <evvers@ya.ru>
+Date: Wed, 17 Dec 2025 08:11:23 +0000
+Subject: [PATCH] core: refuse to create wide-area record browsers when
+ wide-area is off
+
+It fixes a bug where it was possible for unprivileged local users to
+crash avahi-daemon (with wide-area disabled) by creating record browsers
+with the AVAHI_LOOKUP_USE_WIDE_AREA flag set via D-Bus (either by calling
+the RecordBrowserNew method directly or by creating hostname/address/service
+resolvers/browsers that create those browsers internally themselves).
+
+```
+$ gdbus call --system --dest org.freedesktop.Avahi --object-path / --method org.freedesktop.Avahi.Server.ResolveHostName -- -1 -1 yo.local -1 1
+Error: GDBus.Error:org.freedesktop.DBus.Error.NoReply: Message recipient disconnected from message bus without replying
+```
+```
+dbus-protocol.c: interface=org.freedesktop.Avahi.Server, path=/, member=ResolveHostName
+avahi-daemon: wide-area.c:725: avahi_wide_area_scan_cache: Assertion `e' failed.
+==307948==
+==307948== Process terminating with default action of signal 6 (SIGABRT)
+==307948==    at 0x4B3630C: __pthread_kill_implementation (pthread_kill.c:44)
+==307948==    by 0x4ADF921: raise (raise.c:26)
+==307948==    by 0x4AC74AB: abort (abort.c:77)
+==307948==    by 0x4AC741F: __assert_fail_base.cold (assert.c:118)
+==307948==    by 0x48D8B85: avahi_wide_area_scan_cache (wide-area.c:725)
+==307948==    by 0x48C8953: lookup_scan_cache (browse.c:351)
+==307948==    by 0x48C8B1B: lookup_go (browse.c:386)
+==307948==    by 0x48C9148: defer_callback (browse.c:516)
+==307948==    by 0x48AEA0E: expiration_event (timeeventq.c:94)
+==307948==    by 0x489D3AE: timeout_callback (simple-watch.c:447)
+==307948==    by 0x489D787: avahi_simple_poll_dispatch (simple-watch.c:563)
+==307948==    by 0x489D91E: avahi_simple_poll_iterate (simple-watch.c:605)
+==307948==
+```
+
+wide-area has been disabled by default since
+9c4214146738146e454f098264690e8e884c39bd (v0.9-rc2).
+
+https://github.com/avahi/avahi/security/advisories/GHSA-mhf3-865v-g5rc
+
+CVE: CVE-2025-68276
+Upstream-Status: Backport [https://github.com/avahi/avahi/commit/2d48e42d44a183f26a4d12d1f5d41abb9b7c6355]
+(cherry picked from commit 2d48e42d44a183f26a4d12d1f5d41abb9b7c6355)
+Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
+---
+ avahi-core/browse.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/avahi-core/browse.c b/avahi-core/browse.c
+index e8a915e..59d53cb 100644
+--- a/avahi-core/browse.c
++++ b/avahi-core/browse.c
+@@ -541,6 +541,11 @@ AvahiSRecordBrowser *avahi_s_record_browser_prepare(
+     AVAHI_CHECK_VALIDITY_RETURN_NULL(server, AVAHI_FLAGS_VALID(flags, AVAHI_LOOKUP_USE_WIDE_AREA|AVAHI_LOOKUP_USE_MULTICAST), AVAHI_ERR_INVALID_FLAGS);
+     AVAHI_CHECK_VALIDITY_RETURN_NULL(server, !(flags & AVAHI_LOOKUP_USE_WIDE_AREA) || !(flags & AVAHI_LOOKUP_USE_MULTICAST), AVAHI_ERR_INVALID_FLAGS);
+ 
++    if ((flags & AVAHI_LOOKUP_USE_WIDE_AREA) && !server->wide_area_lookup_engine) {
++        avahi_server_set_errno(server, AVAHI_ERR_NOT_SUPPORTED);
++        return NULL;
++    }
++
+     if (!(b = avahi_new(AvahiSRecordBrowser, 1))) {
+         avahi_server_set_errno(server, AVAHI_ERR_NO_MEMORY);
+         return NULL;


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [OE-core][scarthgap][PATCH 2/2] avahi: patch CVE-2026-24401
  2026-01-25  9:40 [OE-core][scarthgap][PATCH 1/2] avahi: patch CVE-2025-68276 ankur.tyagi85
@ 2026-01-25  9:40 ` ankur.tyagi85
  2026-01-25  9:45   ` Ankur Tyagi
  2026-02-04 17:40 ` [OE-core][scarthgap][PATCH 1/2] avahi: patch CVE-2025-68276 Yoann Congal
  1 sibling, 1 reply; 5+ messages in thread
From: ankur.tyagi85 @ 2026-01-25  9:40 UTC (permalink / raw)
  To: openembedded-core; +Cc: Ankur Tyagi

From: Ankur Tyagi <ankur.tyagi85@gmail.com>

Details https://nvd.nist.gov/vuln/detail/CVE-2026-24401

Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
---
 meta/recipes-connectivity/avahi/avahi_0.8.bb  |  1 +
 .../avahi/files/CVE-2026-24401.patch          | 74 +++++++++++++++++++
 2 files changed, 75 insertions(+)
 create mode 100644 meta/recipes-connectivity/avahi/files/CVE-2026-24401.patch

diff --git a/meta/recipes-connectivity/avahi/avahi_0.8.bb b/meta/recipes-connectivity/avahi/avahi_0.8.bb
index bb20fd17cc..bf93e4c7b9 100644
--- a/meta/recipes-connectivity/avahi/avahi_0.8.bb
+++ b/meta/recipes-connectivity/avahi/avahi_0.8.bb
@@ -38,6 +38,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/avahi-${PV}.tar.gz \
            file://CVE-2024-52616.patch \
            file://CVE-2024-52615.patch \
            file://CVE-2025-68276.patch \
+           file://CVE-2026-24401.patch \
            "
 
 GITHUB_BASE_URI = "https://github.com/avahi/avahi/releases/"
diff --git a/meta/recipes-connectivity/avahi/files/CVE-2026-24401.patch b/meta/recipes-connectivity/avahi/files/CVE-2026-24401.patch
new file mode 100644
index 0000000000..47efbdd70c
--- /dev/null
+++ b/meta/recipes-connectivity/avahi/files/CVE-2026-24401.patch
@@ -0,0 +1,74 @@
+From 5eea2640324928c15936b7a2bcbf8ea0de7b08f7 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 uncontrolled recursion bug using a simple loop
+ detection algorithm
+
+Closes https://github.com/avahi/avahi/issues/501
+
+CVE: CVE-2025-68468
+Upstream-Status: Backport [https://github.com/avahi/avahi/commit/78eab31128479f06e30beb8c1cbf99dd921e2524]
+(cherry picked from commit 78eab31128479f06e30beb8c1cbf99dd921e2524)
+Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
+---
+ avahi-core/browse.c | 40 ++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 40 insertions(+)
+
+diff --git a/avahi-core/browse.c b/avahi-core/browse.c
+index f461083..975b3e9 100644
+--- a/avahi-core/browse.c
++++ b/avahi-core/browse.c
+@@ -401,6 +401,40 @@ static int lookup_go(AvahiSRBLookup *l) {
+     return n;
+ }
+ 
++static int lookup_exists_in_path(AvahiSRBLookup* lookup, AvahiSRBLookup* from, AvahiSRBLookup* to) {
++    AvahiRList* rl;
++    if (from == to)
++        return 0;
++    for (rl = from->cname_lookups; rl; rl = rl->rlist_next) {
++        int r = lookup_exists_in_path(lookup, rl->data, to);
++        if (r == 1) {
++            /* loop detected, propagate result */
++            return r;
++        } else if (r == 0) {
++            /* is loop detected? */
++            return lookup == from;
++        } else {
++	        /* `to` not found, continue */
++            continue;
++        }
++    }
++    /* no path found */
++    return -1;
++}
++
++static int cname_would_create_loop(AvahiSRBLookup* l, AvahiSRBLookup* n) {
++    int ret;
++    if (l == n)
++        /* Loop to self */
++        return 1;
++
++    ret = lookup_exists_in_path(n, l->record_browser->root_lookup, l);
++
++    /* Path to n always exists */
++    assert(ret != -1);
++    return ret;
++}
++
+ static void lookup_handle_cname(AvahiSRBLookup *l, AvahiIfIndex interface, AvahiProtocol protocol, AvahiLookupFlags flags, AvahiRecord *r) {
+     AvahiKey *k;
+     AvahiSRBLookup *n;
+@@ -420,6 +454,12 @@ static void lookup_handle_cname(AvahiSRBLookup *l, AvahiIfIndex interface, Avahi
+         return;
+     }
+ 
++    if (cname_would_create_loop(l, n)) {
++        /* CNAME loops are not allowed */
++        lookup_unref(n);
++        return;
++    }
++
+     l->cname_lookups = avahi_rlist_prepend(l->cname_lookups, lookup_ref(n));
+ 
+     lookup_go(n);


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [OE-core][scarthgap][PATCH 2/2] avahi: patch CVE-2026-24401
  2026-01-25  9:40 ` [OE-core][scarthgap][PATCH 2/2] avahi: patch CVE-2026-24401 ankur.tyagi85
@ 2026-01-25  9:45   ` Ankur Tyagi
  0 siblings, 0 replies; 5+ messages in thread
From: Ankur Tyagi @ 2026-01-25  9:45 UTC (permalink / raw)
  To: openembedded-core

On Sun, Jan 25, 2026 at 10:40 PM <ankur.tyagi85@gmail.com> wrote:
>
> From: Ankur Tyagi <ankur.tyagi85@gmail.com>
>
> Details https://nvd.nist.gov/vuln/detail/CVE-2026-24401
>
> Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
> ---
>  meta/recipes-connectivity/avahi/avahi_0.8.bb  |  1 +
>  .../avahi/files/CVE-2026-24401.patch          | 74 +++++++++++++++++++
>  2 files changed, 75 insertions(+)
>  create mode 100644 meta/recipes-connectivity/avahi/files/CVE-2026-24401.patch
>
> diff --git a/meta/recipes-connectivity/avahi/avahi_0.8.bb b/meta/recipes-connectivity/avahi/avahi_0.8.bb
> index bb20fd17cc..bf93e4c7b9 100644
> --- a/meta/recipes-connectivity/avahi/avahi_0.8.bb
> +++ b/meta/recipes-connectivity/avahi/avahi_0.8.bb
> @@ -38,6 +38,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/avahi-${PV}.tar.gz \
>             file://CVE-2024-52616.patch \
>             file://CVE-2024-52615.patch \
>             file://CVE-2025-68276.patch \
> +           file://CVE-2026-24401.patch \
>             "
>
>  GITHUB_BASE_URI = "https://github.com/avahi/avahi/releases/"
> diff --git a/meta/recipes-connectivity/avahi/files/CVE-2026-24401.patch b/meta/recipes-connectivity/avahi/files/CVE-2026-24401.patch
> new file mode 100644
> index 0000000000..47efbdd70c
> --- /dev/null
> +++ b/meta/recipes-connectivity/avahi/files/CVE-2026-24401.patch
> @@ -0,0 +1,74 @@
> +From 5eea2640324928c15936b7a2bcbf8ea0de7b08f7 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 uncontrolled recursion bug using a simple loop
> + detection algorithm
> +
> +Closes https://github.com/avahi/avahi/issues/501
> +
> +CVE: CVE-2025-68468

sending v2 to fix the CVE reference

> +Upstream-Status: Backport [https://github.com/avahi/avahi/commit/78eab31128479f06e30beb8c1cbf99dd921e2524]
> +(cherry picked from commit 78eab31128479f06e30beb8c1cbf99dd921e2524)
> +Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
> +---
> + avahi-core/browse.c | 40 ++++++++++++++++++++++++++++++++++++++++
> + 1 file changed, 40 insertions(+)
> +
> +diff --git a/avahi-core/browse.c b/avahi-core/browse.c
> +index f461083..975b3e9 100644
> +--- a/avahi-core/browse.c
> ++++ b/avahi-core/browse.c
> +@@ -401,6 +401,40 @@ static int lookup_go(AvahiSRBLookup *l) {
> +     return n;
> + }
> +
> ++static int lookup_exists_in_path(AvahiSRBLookup* lookup, AvahiSRBLookup* from, AvahiSRBLookup* to) {
> ++    AvahiRList* rl;
> ++    if (from == to)
> ++        return 0;
> ++    for (rl = from->cname_lookups; rl; rl = rl->rlist_next) {
> ++        int r = lookup_exists_in_path(lookup, rl->data, to);
> ++        if (r == 1) {
> ++            /* loop detected, propagate result */
> ++            return r;
> ++        } else if (r == 0) {
> ++            /* is loop detected? */
> ++            return lookup == from;
> ++        } else {
> ++              /* `to` not found, continue */
> ++            continue;
> ++        }
> ++    }
> ++    /* no path found */
> ++    return -1;
> ++}
> ++
> ++static int cname_would_create_loop(AvahiSRBLookup* l, AvahiSRBLookup* n) {
> ++    int ret;
> ++    if (l == n)
> ++        /* Loop to self */
> ++        return 1;
> ++
> ++    ret = lookup_exists_in_path(n, l->record_browser->root_lookup, l);
> ++
> ++    /* Path to n always exists */
> ++    assert(ret != -1);
> ++    return ret;
> ++}
> ++
> + static void lookup_handle_cname(AvahiSRBLookup *l, AvahiIfIndex interface, AvahiProtocol protocol, AvahiLookupFlags flags, AvahiRecord *r) {
> +     AvahiKey *k;
> +     AvahiSRBLookup *n;
> +@@ -420,6 +454,12 @@ static void lookup_handle_cname(AvahiSRBLookup *l, AvahiIfIndex interface, Avahi
> +         return;
> +     }
> +
> ++    if (cname_would_create_loop(l, n)) {
> ++        /* CNAME loops are not allowed */
> ++        lookup_unref(n);
> ++        return;
> ++    }
> ++
> +     l->cname_lookups = avahi_rlist_prepend(l->cname_lookups, lookup_ref(n));
> +
> +     lookup_go(n);


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [OE-core][scarthgap][PATCH 1/2] avahi: patch CVE-2025-68276
  2026-01-25  9:40 [OE-core][scarthgap][PATCH 1/2] avahi: patch CVE-2025-68276 ankur.tyagi85
  2026-01-25  9:40 ` [OE-core][scarthgap][PATCH 2/2] avahi: patch CVE-2026-24401 ankur.tyagi85
@ 2026-02-04 17:40 ` Yoann Congal
  2026-02-04 17:43   ` Ankur Tyagi
  1 sibling, 1 reply; 5+ messages in thread
From: Yoann Congal @ 2026-02-04 17:40 UTC (permalink / raw)
  To: ankur.tyagi85, openembedded-core

On Sun Jan 25, 2026 at 10:40 AM CET, Ankur Tyagi via lists.openembedded.org wrote:
> From: Ankur Tyagi <ankur.tyagi85@gmail.com>
>
> Backport the patch[1] from the PR[2] mentioned in the nvd[3].
>
> [1] https://github.com/avahi/avahi/commit/2d48e42d44a183f26a4d12d1f5d41abb9b7c6355
> [2] https://github.com/avahi/avahi/pull/806
> [3] https://nvd.nist.gov/vuln/detail/CVE-2025-68276
>
> Dropped CI changes from the original PR during backport.
>
> Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
> ---
>  meta/recipes-connectivity/avahi/avahi_0.8.bb  |  1 +
>  .../avahi/files/CVE-2025-68276.patch          | 65 +++++++++++++++++++
>  2 files changed, 66 insertions(+)
>  create mode 100644 meta/recipes-connectivity/avahi/files/CVE-2025-68276.patch

Hello,

Thank you for the patch. As far as I can tell, a fix for CVE-2025-68276
is also needed for whinlatter. Can you send a fix there as well?

Thanks!

>
> diff --git a/meta/recipes-connectivity/avahi/avahi_0.8.bb b/meta/recipes-connectivity/avahi/avahi_0.8.bb
> index 7930bd3037..bb20fd17cc 100644
> --- a/meta/recipes-connectivity/avahi/avahi_0.8.bb
> +++ b/meta/recipes-connectivity/avahi/avahi_0.8.bb
> @@ -37,6 +37,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/avahi-${PV}.tar.gz \
>             file://CVE-2023-38473.patch \
>             file://CVE-2024-52616.patch \
>             file://CVE-2024-52615.patch \
> +           file://CVE-2025-68276.patch \
>             "
>  
>  GITHUB_BASE_URI = "https://github.com/avahi/avahi/releases/"
> diff --git a/meta/recipes-connectivity/avahi/files/CVE-2025-68276.patch b/meta/recipes-connectivity/avahi/files/CVE-2025-68276.patch
> new file mode 100644
> index 0000000000..75169419f1
> --- /dev/null
> +++ b/meta/recipes-connectivity/avahi/files/CVE-2025-68276.patch
> @@ -0,0 +1,65 @@
> +From 8ec85459d8e6e59cc14457e16fb7ba171901f90e Mon Sep 17 00:00:00 2001
> +From: Evgeny Vereshchagin <evvers@ya.ru>
> +Date: Wed, 17 Dec 2025 08:11:23 +0000
> +Subject: [PATCH] core: refuse to create wide-area record browsers when
> + wide-area is off
> +
> +It fixes a bug where it was possible for unprivileged local users to
> +crash avahi-daemon (with wide-area disabled) by creating record browsers
> +with the AVAHI_LOOKUP_USE_WIDE_AREA flag set via D-Bus (either by calling
> +the RecordBrowserNew method directly or by creating hostname/address/service
> +resolvers/browsers that create those browsers internally themselves).
> +
> +```
> +$ gdbus call --system --dest org.freedesktop.Avahi --object-path / --method org.freedesktop.Avahi.Server.ResolveHostName -- -1 -1 yo.local -1 1
> +Error: GDBus.Error:org.freedesktop.DBus.Error.NoReply: Message recipient disconnected from message bus without replying
> +```
> +```
> +dbus-protocol.c: interface=org.freedesktop.Avahi.Server, path=/, member=ResolveHostName
> +avahi-daemon: wide-area.c:725: avahi_wide_area_scan_cache: Assertion `e' failed.
> +==307948==
> +==307948== Process terminating with default action of signal 6 (SIGABRT)
> +==307948==    at 0x4B3630C: __pthread_kill_implementation (pthread_kill.c:44)
> +==307948==    by 0x4ADF921: raise (raise.c:26)
> +==307948==    by 0x4AC74AB: abort (abort.c:77)
> +==307948==    by 0x4AC741F: __assert_fail_base.cold (assert.c:118)
> +==307948==    by 0x48D8B85: avahi_wide_area_scan_cache (wide-area.c:725)
> +==307948==    by 0x48C8953: lookup_scan_cache (browse.c:351)
> +==307948==    by 0x48C8B1B: lookup_go (browse.c:386)
> +==307948==    by 0x48C9148: defer_callback (browse.c:516)
> +==307948==    by 0x48AEA0E: expiration_event (timeeventq.c:94)
> +==307948==    by 0x489D3AE: timeout_callback (simple-watch.c:447)
> +==307948==    by 0x489D787: avahi_simple_poll_dispatch (simple-watch.c:563)
> +==307948==    by 0x489D91E: avahi_simple_poll_iterate (simple-watch.c:605)
> +==307948==
> +```
> +
> +wide-area has been disabled by default since
> +9c4214146738146e454f098264690e8e884c39bd (v0.9-rc2).
> +
> +https://github.com/avahi/avahi/security/advisories/GHSA-mhf3-865v-g5rc
> +
> +CVE: CVE-2025-68276
> +Upstream-Status: Backport [https://github.com/avahi/avahi/commit/2d48e42d44a183f26a4d12d1f5d41abb9b7c6355]
> +(cherry picked from commit 2d48e42d44a183f26a4d12d1f5d41abb9b7c6355)
> +Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
> +---
> + avahi-core/browse.c | 5 +++++
> + 1 file changed, 5 insertions(+)
> +
> +diff --git a/avahi-core/browse.c b/avahi-core/browse.c
> +index e8a915e..59d53cb 100644
> +--- a/avahi-core/browse.c
> ++++ b/avahi-core/browse.c
> +@@ -541,6 +541,11 @@ AvahiSRecordBrowser *avahi_s_record_browser_prepare(
> +     AVAHI_CHECK_VALIDITY_RETURN_NULL(server, AVAHI_FLAGS_VALID(flags, AVAHI_LOOKUP_USE_WIDE_AREA|AVAHI_LOOKUP_USE_MULTICAST), AVAHI_ERR_INVALID_FLAGS);
> +     AVAHI_CHECK_VALIDITY_RETURN_NULL(server, !(flags & AVAHI_LOOKUP_USE_WIDE_AREA) || !(flags & AVAHI_LOOKUP_USE_MULTICAST), AVAHI_ERR_INVALID_FLAGS);
> + 
> ++    if ((flags & AVAHI_LOOKUP_USE_WIDE_AREA) && !server->wide_area_lookup_engine) {
> ++        avahi_server_set_errno(server, AVAHI_ERR_NOT_SUPPORTED);
> ++        return NULL;
> ++    }
> ++
> +     if (!(b = avahi_new(AvahiSRecordBrowser, 1))) {
> +         avahi_server_set_errno(server, AVAHI_ERR_NO_MEMORY);
> +         return NULL;


-- 
Yoann Congal
Smile ECS



^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [OE-core][scarthgap][PATCH 1/2] avahi: patch CVE-2025-68276
  2026-02-04 17:40 ` [OE-core][scarthgap][PATCH 1/2] avahi: patch CVE-2025-68276 Yoann Congal
@ 2026-02-04 17:43   ` Ankur Tyagi
  0 siblings, 0 replies; 5+ messages in thread
From: Ankur Tyagi @ 2026-02-04 17:43 UTC (permalink / raw)
  To: Yoann Congal; +Cc: openembedded-core

On Thu, Feb 5, 2026 at 6:40 AM Yoann Congal <yoann.congal@smile.fr> wrote:
>
> On Sun Jan 25, 2026 at 10:40 AM CET, Ankur Tyagi via lists.openembedded.org wrote:
> > From: Ankur Tyagi <ankur.tyagi85@gmail.com>
> >
> > Backport the patch[1] from the PR[2] mentioned in the nvd[3].
> >
> > [1] https://github.com/avahi/avahi/commit/2d48e42d44a183f26a4d12d1f5d41abb9b7c6355
> > [2] https://github.com/avahi/avahi/pull/806
> > [3] https://nvd.nist.gov/vuln/detail/CVE-2025-68276
> >
> > Dropped CI changes from the original PR during backport.
> >
> > Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
> > ---
> >  meta/recipes-connectivity/avahi/avahi_0.8.bb  |  1 +
> >  .../avahi/files/CVE-2025-68276.patch          | 65 +++++++++++++++++++
> >  2 files changed, 66 insertions(+)
> >  create mode 100644 meta/recipes-connectivity/avahi/files/CVE-2025-68276.patch
>
> Hello,
>
> Thank you for the patch. As far as I can tell, a fix for CVE-2025-68276
> is also needed for whinlatter. Can you send a fix there as well?
>
> Thanks!
>

Sure, I will.

> >
> > diff --git a/meta/recipes-connectivity/avahi/avahi_0.8.bb b/meta/recipes-connectivity/avahi/avahi_0.8.bb
> > index 7930bd3037..bb20fd17cc 100644
> > --- a/meta/recipes-connectivity/avahi/avahi_0.8.bb
> > +++ b/meta/recipes-connectivity/avahi/avahi_0.8.bb
> > @@ -37,6 +37,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/avahi-${PV}.tar.gz \
> >             file://CVE-2023-38473.patch \
> >             file://CVE-2024-52616.patch \
> >             file://CVE-2024-52615.patch \
> > +           file://CVE-2025-68276.patch \
> >             "
> >
> >  GITHUB_BASE_URI = "https://github.com/avahi/avahi/releases/"
> > diff --git a/meta/recipes-connectivity/avahi/files/CVE-2025-68276.patch b/meta/recipes-connectivity/avahi/files/CVE-2025-68276.patch
> > new file mode 100644
> > index 0000000000..75169419f1
> > --- /dev/null
> > +++ b/meta/recipes-connectivity/avahi/files/CVE-2025-68276.patch
> > @@ -0,0 +1,65 @@
> > +From 8ec85459d8e6e59cc14457e16fb7ba171901f90e Mon Sep 17 00:00:00 2001
> > +From: Evgeny Vereshchagin <evvers@ya.ru>
> > +Date: Wed, 17 Dec 2025 08:11:23 +0000
> > +Subject: [PATCH] core: refuse to create wide-area record browsers when
> > + wide-area is off
> > +
> > +It fixes a bug where it was possible for unprivileged local users to
> > +crash avahi-daemon (with wide-area disabled) by creating record browsers
> > +with the AVAHI_LOOKUP_USE_WIDE_AREA flag set via D-Bus (either by calling
> > +the RecordBrowserNew method directly or by creating hostname/address/service
> > +resolvers/browsers that create those browsers internally themselves).
> > +
> > +```
> > +$ gdbus call --system --dest org.freedesktop.Avahi --object-path / --method org.freedesktop.Avahi.Server.ResolveHostName -- -1 -1 yo.local -1 1
> > +Error: GDBus.Error:org.freedesktop.DBus.Error.NoReply: Message recipient disconnected from message bus without replying
> > +```
> > +```
> > +dbus-protocol.c: interface=org.freedesktop.Avahi.Server, path=/, member=ResolveHostName
> > +avahi-daemon: wide-area.c:725: avahi_wide_area_scan_cache: Assertion `e' failed.
> > +==307948==
> > +==307948== Process terminating with default action of signal 6 (SIGABRT)
> > +==307948==    at 0x4B3630C: __pthread_kill_implementation (pthread_kill.c:44)
> > +==307948==    by 0x4ADF921: raise (raise.c:26)
> > +==307948==    by 0x4AC74AB: abort (abort.c:77)
> > +==307948==    by 0x4AC741F: __assert_fail_base.cold (assert.c:118)
> > +==307948==    by 0x48D8B85: avahi_wide_area_scan_cache (wide-area.c:725)
> > +==307948==    by 0x48C8953: lookup_scan_cache (browse.c:351)
> > +==307948==    by 0x48C8B1B: lookup_go (browse.c:386)
> > +==307948==    by 0x48C9148: defer_callback (browse.c:516)
> > +==307948==    by 0x48AEA0E: expiration_event (timeeventq.c:94)
> > +==307948==    by 0x489D3AE: timeout_callback (simple-watch.c:447)
> > +==307948==    by 0x489D787: avahi_simple_poll_dispatch (simple-watch.c:563)
> > +==307948==    by 0x489D91E: avahi_simple_poll_iterate (simple-watch.c:605)
> > +==307948==
> > +```
> > +
> > +wide-area has been disabled by default since
> > +9c4214146738146e454f098264690e8e884c39bd (v0.9-rc2).
> > +
> > +https://github.com/avahi/avahi/security/advisories/GHSA-mhf3-865v-g5rc
> > +
> > +CVE: CVE-2025-68276
> > +Upstream-Status: Backport [https://github.com/avahi/avahi/commit/2d48e42d44a183f26a4d12d1f5d41abb9b7c6355]
> > +(cherry picked from commit 2d48e42d44a183f26a4d12d1f5d41abb9b7c6355)
> > +Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
> > +---
> > + avahi-core/browse.c | 5 +++++
> > + 1 file changed, 5 insertions(+)
> > +
> > +diff --git a/avahi-core/browse.c b/avahi-core/browse.c
> > +index e8a915e..59d53cb 100644
> > +--- a/avahi-core/browse.c
> > ++++ b/avahi-core/browse.c
> > +@@ -541,6 +541,11 @@ AvahiSRecordBrowser *avahi_s_record_browser_prepare(
> > +     AVAHI_CHECK_VALIDITY_RETURN_NULL(server, AVAHI_FLAGS_VALID(flags, AVAHI_LOOKUP_USE_WIDE_AREA|AVAHI_LOOKUP_USE_MULTICAST), AVAHI_ERR_INVALID_FLAGS);
> > +     AVAHI_CHECK_VALIDITY_RETURN_NULL(server, !(flags & AVAHI_LOOKUP_USE_WIDE_AREA) || !(flags & AVAHI_LOOKUP_USE_MULTICAST), AVAHI_ERR_INVALID_FLAGS);
> > +
> > ++    if ((flags & AVAHI_LOOKUP_USE_WIDE_AREA) && !server->wide_area_lookup_engine) {
> > ++        avahi_server_set_errno(server, AVAHI_ERR_NOT_SUPPORTED);
> > ++        return NULL;
> > ++    }
> > ++
> > +     if (!(b = avahi_new(AvahiSRecordBrowser, 1))) {
> > +         avahi_server_set_errno(server, AVAHI_ERR_NO_MEMORY);
> > +         return NULL;
>
>
> --
> Yoann Congal
> Smile ECS
>


^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2026-02-04 17:43 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-01-25  9:40 [OE-core][scarthgap][PATCH 1/2] avahi: patch CVE-2025-68276 ankur.tyagi85
2026-01-25  9:40 ` [OE-core][scarthgap][PATCH 2/2] avahi: patch CVE-2026-24401 ankur.tyagi85
2026-01-25  9:45   ` Ankur Tyagi
2026-02-04 17:40 ` [OE-core][scarthgap][PATCH 1/2] avahi: patch CVE-2025-68276 Yoann Congal
2026-02-04 17:43   ` Ankur Tyagi

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox