Skip to content

Conversation

@kevin-b-lockwood
Copy link
Contributor

@kevin-b-lockwood kevin-b-lockwood commented Jun 18, 2025

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 CVE-2025-29923
  • [Low] Patch telegraf for CVE-2025-46327
    • 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 CVE-2025-29923
  • [Low] Patch telegraf for CVE-2025-46327
    • 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

Links to CVEs
Test Methodology
  • Local build
  • Patch applied cleanly:
    image
    image

@kevin-b-lockwood kevin-b-lockwood requested a review from a team as a code owner June 18, 2025 22:50
@kevin-b-lockwood kevin-b-lockwood marked this pull request as draft June 18, 2025 22:50
@microsoft-github-policy-service microsoft-github-policy-service bot added Packaging 3.0-dev PRs Destined for AzureLinux 3.0 labels Jun 18, 2025
@kevin-b-lockwood kevin-b-lockwood marked this pull request as ready for review June 19, 2025 20:47
@Malateshk007 Malateshk007 requested a review from Sumynwa June 20, 2025 07:54
@Sumynwa
Copy link
Contributor

Sumynwa commented Jun 25, 2025

@Sumynwa
Copy link
Contributor

Sumynwa commented Jun 25, 2025

Patch changes are ok compared with the upstream patch.

@kevin-b-lockwood kevin-b-lockwood changed the title [Low] Patch telegraf for CVE-2025-29923 [Low] Patch telegraf for CVE-2025-29923, CVE-2025-46327 Jun 26, 2025
@kevin-b-lockwood kevin-b-lockwood requested a review from Sumynwa July 7, 2025 17:30
@Malateshk007
Copy link

@Sumynwa. could you please share your review and signoff on this PR?

@Malateshk007
Copy link

@Sumynwa. could you please share your review and signoff on this PR?
@Sumynwa, gentle reminder!

@Malateshk007
Copy link

@Sumynwa, gentle reminder!

@Kanishk-Bansal
Copy link
Contributor

Buddy Build

@Sumynwa
Copy link
Contributor

Sumynwa commented Sep 18, 2025

CVE-2025-29923.patch

Upstream reference: Patch
Backport: YES

Summary of downstream patch
Missing files in patch:
bench_decode_test.go - NOT present in vendored sources
redist_test.go - NOT present in vendored sources

Missing symbols:
UnstableResp3 - NOT present in vendored sources

@sallhms
Copy link
Contributor

sallhms commented Sep 24, 2025

This is for all concerned,

@jykanase will be taking this CVE fix forward.

@jykanase
Copy link
Contributor

jykanase commented Oct 1, 2025

This is for all concerned,

@jykanase will be taking this CVE fix forward.

This PR is replaced by #14747

@kgodara912
Copy link
Contributor

Closing as replaced with other PR.

@kgodara912 kgodara912 closed this Oct 16, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3.0-dev PRs Destined for AzureLinux 3.0 Packaging security

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants