Skip to content

[AutoPR- Security] Patch ldns for CVE-2026-10846 [HIGH]#17690

Merged
jslobodzian merged 2 commits into
microsoft:fasttrack/3.0from
azurelinux-security:azure-autosec/ldns/3.0/1136624
Jun 12, 2026
Merged

[AutoPR- Security] Patch ldns for CVE-2026-10846 [HIGH]#17690
jslobodzian merged 2 commits into
microsoft:fasttrack/3.0from
azurelinux-security:azure-autosec/ldns/3.0/1136624

Conversation

@azurelinux-security

@azurelinux-security azurelinux-security commented Jun 11, 2026

Copy link
Copy Markdown

Auto Patch ldns for CVE-2026-10846.

Autosec pipeline run -> https://dev.azure.com/mariner-org/mariner/_build/results?buildId=1136624&view=results

Merge Checklist

All boxes should be checked before merging the PR (just tick any boxes which don't apply to this PR)

  • The toolchain has been rebuilt successfully (or no changes were made to it)
  • The toolchain/worker package manifests are up-to-date
  • Any updated packages successfully build (or no packages were changed)
  • Packages depending on static components modified in this PR (Golang, *-static subpackages, etc.) have had their Release tag incremented.
  • Package tests (%check section) have been verified with RUN_CHECK=y for existing SPEC files, or added to new SPEC files
  • All package sources are available
  • cgmanifest files are up-to-date and sorted (./cgmanifest.json, ./toolkit/scripts/toolchain/cgmanifest.json, .github/workflows/cgmanifest.json)
  • LICENSE-MAP files are up-to-date (./LICENSES-AND-NOTICES/SPECS/data/licenses.json, ./LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md, ./LICENSES-AND-NOTICES/SPECS/LICENSE-EXCEPTIONS.PHOTON)
  • All source files have up-to-date hashes in the *.signatures.json files
  • sudo make go-tidy-all and sudo make go-test-coverage pass
  • Documentation has been updated to match any changes to the build system
  • Ready to merge

Summary

What does the PR accomplish, why was it needed?

Change Log
Does this affect the toolchain?

YES/NO

Associated issues
  • N/A
Links to CVEs
Test Methodology

@microsoft-github-policy-service microsoft-github-policy-service Bot added Packaging fasttrack/3.0 PRs Destined for Azure Linux 3.0 labels Jun 11, 2026
@kgodara912

Copy link
Copy Markdown

Buddy build

@kgodara912

Copy link
Copy Markdown

Backport Adaptation Notes

Backport of NLnetLabs/ldns@9ea51a6 to ldns 1.8.3.

What was adapted:

  1. Enum insertion point changed — New status codes (LDNS_STATUS_ID_DID_NOT_MATCH, LDNS_STATUS_QDCOUNT_MUST_BE_ONE, LDNS_STATUS_QUERY_DID_NOT_MATCH) are appended after LDNS_STATUS_INVALID_SVCPARAM_VALUE (last entry in 1.8.3) instead of after LDNS_STATUS_EQUAL_RR which only exists in newer versions.

  2. TXID matching hunk omitted — The original commit changes an existing TXID check (printf("wrong TXID!\n")LDNS_STATUS_ID_DID_NOT_MATCH) and updates a return path (LDNS_STATUS_ERRstatus ? status : LDNS_STATUS_ERR). This entire code path does not exist in 1.8.3, so the hunk is not applicable.

  3. LDNS_STATUS_ID_DID_NOT_MATCH defined but unused — The enum value is still added for ABI consistency with upstream, but no code references it in 1.8.3 since the TXID verification logic was introduced in a later release.

What was preserved as-is:

  • QDCOUNT validation at ldns_send_buffer() entry (rejects queries without exactly one question)
  • Response question section matching before returning result (verifies response matches query)
  • All three new error codes and their human-readable strings in error.c

@kgodara912 kgodara912 marked this pull request as ready for review June 11, 2026 10:57
@kgodara912 kgodara912 requested a review from a team as a code owner June 11, 2026 10:57
@kgodara912 kgodara912 added security CVEFixReadyForMaintainerReview When a CVE fix has been reviewed by release manager and is ready for stable maintainer review AutoPR-Security labels Jun 11, 2026
@jslobodzian jslobodzian merged commit 9f2a3f6 into microsoft:fasttrack/3.0 Jun 12, 2026
26 of 30 checks passed
@CBL-Mariner-Bot

Copy link
Copy Markdown
Collaborator

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

AI Backport AutoPR-Security CVEFixReadyForMaintainerReview When a CVE fix has been reviewed by release manager and is ready for stable maintainer review fasttrack/3.0 PRs Destined for Azure Linux 3.0 Packaging security

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants