[High] patch containerd2 for CVE-2026-35469, CVE-2026-34986

[jykanase]

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

patch containerd2 for CVE-2026-35469, CVE-2026-34986

Change Log

• Modified CVE-2026-35469
• Add CVE-2026-34986

Does this affect the toolchain?

NO

Associated issues

• #xxxx

Links to CVEs

• https://nvd.nist.gov/vuln/detail/CVE-2026-35469
• https://nvd.nist.gov/vuln/detail/CVE-2026-34986

Test Methodology

• local build:

[Kanishk-Bansal]

/azurepipelines run

[azure-pipelines]

Azure Pipelines successfully started running 1 pipeline(s).

[Kanishk-Bansal]

Patch was lost in the last upgrade we need this fix

[jslobodzian]

@jykanase why does the changelog cve number not match the CVE and patch. What does "Modified patch" mean?

[acortelyou]

curious why 2.1.6 was merged instead of 2.1.7 which already had this patch

[Kanishk-Bansal]

/azurepipelines run

[azure-pipelines]

Azure Pipelines successfully started running 1 pipeline(s).

[aadhar-agarwal]

nitpick (non-blocking): Drop options_test.go from the patch

The patch creates vendor/.../spdy/options_test.go, but go mod vendor excludes test files from the vendor directory. Confirmed this file is not present in containerd's upstream vendor tree either. Harmless, but can we drop it from this patch?

[aadhar-agarwal]

curious why 2.1.6 was merged instead of 2.1.7 which already had this patch

2.1.7 introduced AppArmor profile changes that add abi/3.0 - this requires the apparmor-abstractions package, which isn't installed in AgentBaker. All AKS clusters were failing to deploy with Could not open 'abi/3.0': No such file or directory. We stayed on 2.1.6 and backported the CVE fixes to avoid that breakage while the AppArmor dependency is resolved. There is a patch for this in containerd that we can carry forward

[CBL-Mariner-Bot]

Auto cherry-pick results:

• 3.0-dev ✅ -> [AUTO-CHERRYPICK] [High] patch containerd2 for CVE-2026-35469, CVE-2026-34986 - branch 3.0-dev #16945

Auto cherry-pick pipeline run -> https://dev.azure.com/mariner-org/mariner/_build/results?buildId=1103604&view=results