Skip to content

[High] Patch protobuf for CVE-2025-4565 #14044

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 26, 2025

Conversation

akhila-guruju
Copy link
Contributor

@akhila-guruju akhila-guruju commented Jun 19, 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

Patch protobuf for CVE-2025-4565
Patch Modified: Yes

  • A new parameter current_depth has been added for the files decoder.py and python_message.py from upstream v29.5 for proper application of patch.
  • Apart from upstream patch, a file python_message.py was also backported to fix the build for python-tensorboard
  • python/google/protobuf/internal/decoder_test.py is not present in source tarball. So, patch is not applied for that file.
  • Some changes in the upstream patch are already included in the source tarball, so they won't appear in the modified patch.

Astrolabe Patch Reference: protocolbuffers/protobuf@17838be .
NIST mentions here https://nvd.nist.gov/vuln/detail/CVE-2025-4565 that it fixes this CVE.

Change Log
  • new file: SPECS/protobuf/CVE-2025-4565.patch
  • modified: SPECS/protobuf/protobuf.spec
Does this affect the toolchain?

NO

Associated issues
  • #xxxx
Links to CVEs
Test Methodology
  • Local Build
  • Patch applies cleanly
image

@akhila-guruju akhila-guruju requested a review from a team as a code owner June 19, 2025 14:12
@microsoft-github-policy-service microsoft-github-policy-service bot added Packaging fasttrack/3.0 PRs Destined for Azure Linux 3.0 labels Jun 19, 2025
@Kanishk-Bansal
Copy link
Contributor

/azurepipelines run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@akhila-guruju akhila-guruju marked this pull request as draft June 19, 2025 14:19
@akhila-guruju akhila-guruju marked this pull request as ready for review June 20, 2025 06:06
@mbykhovtsev-ms
Copy link
Contributor

/azurepipelines run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mbykhovtsev-ms
Copy link
Contributor

Unfortunately it appears the patch is breaking python-tensorboard build. I have checked the logs and the exact change to the decoder.py breaks python-tensorboard build.

@akhila-guruju
Copy link
Contributor Author

Yes, I attempted to fix it as well. The error encountered for python-tensorboard in pipeline was resolved after modifying the patch (by backporting another file from upstream), but now I am encountering another error. Looking into that.
Modified patch: tensor-CVE-2025-4565.patch

image

@akhila-guruju akhila-guruju marked this pull request as draft June 25, 2025 14:17
@akhila-guruju
Copy link
Contributor Author

akhila-guruju commented Jun 26, 2025

Updated the patch and waiting for the Buddy Build results

@akhila-guruju akhila-guruju marked this pull request as ready for review June 26, 2025 06:54
@Kanishk-Bansal
Copy link
Contributor

/azurepipelines run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

Copy link
Contributor

@mbykhovtsev-ms mbykhovtsev-ms left a comment

Choose a reason for hiding this comment

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

Looks like the updated patch is now working fine with python-tensorboard

@mbykhovtsev-ms mbykhovtsev-ms added the CVEFixReadyForMaintainerReview When a CVE fix has been reviewed by release manager and is ready for stable maintainer review label Jun 26, 2025
@jslobodzian jslobodzian merged commit d237a0c into microsoft:fasttrack/3.0 Jun 26, 2025
21 of 24 checks passed
CBL-Mariner-Bot pushed a commit that referenced this pull request Jun 26, 2025
@CBL-Mariner-Bot
Copy link
Collaborator

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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