[Low] Patch telegraf for CVE-2025-29923, CVE-2025-46327

[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

• [Low] Patch telegraf for GHSA-92cp-5422-2mw7
• [Low] Patch telegraf for GHSA-6jgm-j7h2-2fqg
  Required backporting four patches so that the actual patch would apply. Any patches that were changed beyond adding the patch link to the commit message have been re-written such that I am listed as the author, and the main changes made were simply omitting changes to files that we do not ship.

Change Log

• [Low] Patch telegraf for GHSA-92cp-5422-2mw7
  Patch did not apply cleanly, I had to remove all references to UnstableResp3 as that symbol is not present in the version we ship.
  Upstream Patch Link: https://github.com/redis/go-redis/commit/d236865b0cfa1b752ea4b7da666b1fdcd0acebb6.patch
  Patch was found via astrolabe

• [Low] Patch telegraf for GHSA-6jgm-j7h2-2fqg
  Required backporting four patches so that the actual patch would apply. Any patches that were changed beyond adding the patch link to the commit message have been re-written such that I am listed as the author, and the main changes made were simply omitting changes to files that we do not ship.
  Initial patch was found via astrolabe, backported supporting patches were found via git blame.

Does this affect the toolchain?

NO

Associated issues

• #xxxx

Links to CVEs

• https://nvd.nist.gov/vuln/detail/CVE-2025-29923
• https://nvd.nist.gov/vuln/detail/CVE-2025-46327

Test Methodology

• Local build

• Patch applied cleanly:

[Kanishk-Bansal]

Buddy Build

[jykanase]

Buddy Build

Buddy Build is successful.

[Kanishk-Bansal]

Buddy Build

[mfrw]

can we please rebase this to the latest 3.0-dev

[mfrw]

LGTM ✅

Did a thorough check on this CVE patch series:

• Spec Release bumped 23 → 24, and Patch46/47/48 declared in correct order.
• %prep uses %autosetup -a1 -p1 — so the new PatchN declarations get applied automatically; no manual %patchN line needed.
• All three patches apply cleanly w.r.t the vendored sources in v1.31.0/vendor.
• Cross-checked every backport against its upstream commit (see per-patch notes below).
• ADO Test Build green — buildId 1133197.

Per-patch verification

CVE-2025-29923.patch (go-redis CLIENT SETINFO panic)

• Backport of upstream d236865 (PR #3295).
• The dropped UnstableResp3 refs are expected — that symbol doesn't exist in the older vendored copy shipped in this telegraf release.
• The DisableIndentity → DisableIdentity deprecation rename is preserved exactly as upstream.
• Patch looks good w.r.t upstream ✅.

CVE-2025-46327-prereqs.patch (4-commit prereq stack on snowflakedb/gosnowflake)

• 1/4 → e926883
• 2/4 → d8df82e
• 3/4 → 61b822d
• 4/4 → 40e4f5c
• All four match upstream exactly. Patch looks good w.r.t upstream ✅.

CVE-2025-46327.patch (snowflake easy-logging perm-check TOCTOU race)

• Backport of upstream ba94a48 (PR #1382).
• The replacement of the racy os.Stat → os.ReadFile pair with getFileContents(filePath, expectedPerm) (single Open + fstat on the same fd) is exactly the upstream approach.
• Patch looks good w.r.t upstream ✅.

Test Build

Test Build: 1133197 — ✅ succeeded (34 min)

Stage	AMD64	ARM64
build	✅	✅
postbuild	✅	✅
test_install	✅	✅

Only warnings on the run are pre-existing Component Governance alerts that fire on every buddy build — not caused by this PR.

Signed-Off By: @mfrw

[kgodara912]

The patch is too big for low CVE. Is there any better approach to backport the change?

[kgodara912]

Buddy build