Skip to content

avahi: Handle 5 security findings + 1 NixOS mitigation#508012

Merged
vcunat merged 7 commits intoNixOS:staging-nextfrom
samueldr-at-cyberus:samueldr/security/nixos/avahi@2026-04-07
May 8, 2026
Merged

avahi: Handle 5 security findings + 1 NixOS mitigation#508012
vcunat merged 7 commits intoNixOS:staging-nextfrom
samueldr-at-cyberus:samueldr/security/nixos/avahi@2026-04-07

Conversation

@samueldr-at-cyberus
Copy link
Copy Markdown
Contributor

@samueldr-at-cyberus samueldr-at-cyberus commented Apr 8, 2026

These changes:

Handle 5 security findings:

Add mitigations for:

The situation for CVE-2024-52615/CVE-2025-59529 is a bit confusing, but the TLDR is the latter (CVE-2025-59529) is introduced by the “fix” for CVE-2024-52615. There is a pull request for handling CVE-2025-59529, but it is not yet merged upstream, and might be incomplete.

TBD

  • Does this warrant a release note for a potentially breaking change?
  • Which of the many CVE-2024-52615 notes should be dropped/kept?
    • config.warnings? (To be kept.)
    • commented-out knownVulnerabilities entry?
    • commented-out patch?

The avahi package can't be outright marked insecure, which is what knownVulnerabilities would do. There is no way to properly convey "this is a known vulnerability that we have mitigated" in the meta attributes.

Things done

Note

  • Picked staging due to the likelihood of 18K+ affected derivations on x86_64-linux alone.
  • I'm not sure this qualifies as “critical” considering the time spans involved.
  • Changes were tested against nixos-unstable @ 68d8aa3.
  • Built on platform:
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • Tested, as applicable:
  • Ran nixpkgs-review on this PR. See nixpkgs-review usage.
  • Tested basic functionality of all binary files, usually in ./result/bin/.
  • Nixpkgs Release Notes
    • Package update: when the change is major or breaking.
  • NixOS Release Notes
    • Module addition: when adding a new NixOS module.
    • Module update: when the change is significant.
  • Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other READMEs.

The CVE-2024-52615 fix introduces another security issue,
CVE-2025-59529.

Instead CVE-2024-52615 will be mitigated via system configuration.
It would be better if there was a way to mark those mitigated issues in
a way that can be machine-consumed, without causing the package to be
marked insecure.

In actuality, the `insecure` bit for this particular vulnerability would
dpeend on the daemon configuration. The package itself cannot depend on
the system configuration.

A warning could be added to the NixOS module when the mitigation is
disabled.
 - CVE-2025-68276 / GHSA-mhf3-865v-g5rc
 - CVE-2025-68468 / GHSA-cp79-r4x9-vf52
 - CVE-2025-68471 / GHSA-56rf-42xr-qmmg
 - CVE-2026-24401 / GHSA-h4vp-5m8j-f6w3
 - CVE-2026-34933 / GHSA-w65r-6gxh-vhvc
This mitigates:

 - CVE-2024-52615 / GHSA-x6vp-f33h-h32g
 - CVE-2025-59529 / GHSA-73wf-3xmj-x82q (by not fixing CVE-2024-52615)
@nixpkgs-ci nixpkgs-ci Bot added 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 9.needs: reviewer This PR currently has no reviewers requested and needs attention. 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Apr 8, 2026
@Jappie3 Jappie3 added the 1.severity: security Issues which raise a security issue, or PRs that fix one label Apr 9, 2026
@Jappie3
Copy link
Copy Markdown
Contributor

Jappie3 commented Apr 9, 2026

config.warnings for cfg.wideArea should definitely be kept imo (at least until upstream patches CVE-2025-59529) and the commented-out knownVulnerabilities entry will probably save someone quite a bit of time in the future

I don't think knownVulnerabilities is needed here (the vulnerability is fixed by changing the default), but a release note would be nice - this is changing a default option, so best to leave a note / trail for people to follow

@nixpkgs-ci nixpkgs-ci Bot added 8.has: changelog This PR adds or changes release notes 8.has: documentation This PR adds or changes documentation labels Apr 9, 2026
Comment thread nixos/modules/services/networking/avahi-daemon.nix Outdated
@nixpkgs-ci nixpkgs-ci Bot removed the 9.needs: reviewer This PR currently has no reviewers requested and needs attention. label Apr 11, 2026
@vcunat vcunat changed the base branch from staging to staging-next May 8, 2026 08:36
@nixpkgs-ci nixpkgs-ci Bot closed this May 8, 2026
@nixpkgs-ci nixpkgs-ci Bot reopened this May 8, 2026
@vcunat vcunat enabled auto-merge May 8, 2026 08:40
@vcunat
Copy link
Copy Markdown
Member

vcunat commented May 8, 2026

I like the approach taken here, and it's surely better to take this PR as it is than doing nothing for along time.

@vcunat vcunat added this pull request to the merge queue May 8, 2026
Merged via the queue into NixOS:staging-next with commit ffb793d May 8, 2026
26 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

1.severity: security Issues which raise a security issue, or PRs that fix one 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: changelog This PR adds or changes release notes 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants