Skip to content

Conversation

@xordux
Copy link
Contributor

@xordux xordux commented Jul 23, 2024

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 (./SPECS/LICENSES-AND-NOTICES/data/licenses.json, ./SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md, ./SPECS/LICENSES-AND-NOTICES/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
  • If you are adding/removing a .spec file that has multiple-versions supported, please add @microsoft/cbl-mariner-multi-package-reviewers team as reviewer (Eg. golang has 2 versions 1.18, 1.21+)
  • Ready to merge

Summary

What does the PR accomplish, why was it needed?
patch CVE-2024-0397

Change Log
Does this affect the toolchain?

YES

Associated issues
  • #xxxx
Links to CVEs
Test Methodology
  • PR Checks

@xordux xordux marked this pull request as ready for review July 23, 2024 16:32
@xordux xordux requested a review from a team as a code owner July 23, 2024 16:32
@xordux xordux added fasttrack/2.0 PRs Destined for Azure Linux 2.0 security labels Jul 23, 2024
@xordux
Copy link
Contributor Author

xordux commented Jul 23, 2024

Patch taken from python/cpython#118109

@xordux xordux merged commit f1b818c into fasttrack/2.0 Jul 27, 2024
@xordux xordux deleted the rohit/python-CVE-2024-0397 branch July 27, 2024 01:54
CBL-Mariner-Bot pushed a commit that referenced this pull request Jul 27, 2024
(cherry picked from commit f1b818c)
@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

fasttrack/2.0 PRs Destined for Azure Linux 2.0 security

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants