Skip to content

Conversation

@azurelinux-security
Copy link
Contributor

@azurelinux-security azurelinux-security commented Dec 19, 2025

Auto Patch coredns for CVE-2025-68156.

Autosec pipeline run -> https://dev.azure.com/mariner-org/mariner/_build/results?buildId=1008162&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 Dec 19, 2025
@akhila-guruju
Copy link
Contributor

AI backport was good.
In builtin/builtin.go,
there is no builtin function flatten. So, backport patch doesn't contain the upstream patched lines for this function.

In builtin/lib.go
there is no func flatten. So, backport patch doesn't contain the upstream patched lines for this function.

the vendor file builtin_test.go is not present in azl source tarball.

@Kanishk-Bansal Kanishk-Bansal marked this pull request as ready for review December 22, 2025 18:14
@Kanishk-Bansal Kanishk-Bansal requested a review from a team as a code owner December 22, 2025 18:14
@Kanishk-Bansal
Copy link
Contributor

/azurepipeline run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@jslobodzian
Copy link
Collaborator

@akhila-guruju and @Kanishk-Bansal I see that this patch originated from the upstream, but this is a terrible solution. Limiting regression to a depth to10000 mitigates, but it really isn't a solution because what to prevent the stack from blowing out at a depth of 5000 or 1000? I think we should work with MSRC or maybe the upstream on this. Golang should cause a stack overflow panic which will terminate the recursion. Maybe this exception should be caught instead and then have that returned as an error?

Copy link
Collaborator

@jslobodzian jslobodzian left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This fix seems a little underdeveloped to me. It IS a mitigation, but not a solution.

Names []string
+
+ // MaxDepth limits the recursion depth for nested structures.
+ MaxDepth = 10000
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does coredns need to change to set this to a smaller value?

@jslobodzian jslobodzian merged commit 30125d5 into microsoft:fasttrack/3.0 Dec 26, 2025
16 checks passed
CBL-Mariner-Bot pushed a commit that referenced this pull request Dec 26, 2025
Co-authored-by: Kanishk Bansal <103916909+Kanishk-Bansal@users.noreply.github.com>
Co-authored-by: jslobodzian <joslobo@microsoft.com>
(cherry picked from commit 30125d5)
@CBL-Mariner-Bot
Copy link
Collaborator

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants