Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fix CVE-2024-3727 in skopeo #9455

Merged
merged 3 commits into from
Jun 23, 2024
Merged

Fix CVE-2024-3727 in skopeo #9455

merged 3 commits into from
Jun 23, 2024

Conversation

xordux
Copy link
Contributor

@xordux xordux commented Jun 20, 2024 •
edited
Loading

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?
Backport fix CVE-2024-3727 in skopeo

NOTE: The original patch at upstream PR had pkg/blobcache as well but its not present in our vendor directory hence pkg/blobcache is not included in this patch.

Change Log
Does this affect the toolchain?

NO

Associated issues
  • #xxxx
Links to CVEs
Test Methodology
  • Github PR check

@xordux xordux requested a review from a team as a code owner June 20, 2024 10:27
@xordux xordux added security fasttrack/2.0 PRs Destined for AzureLinux 2.0 labels Jun 20, 2024
@eric-desrochers eric-desrochers requested a review from a team June 20, 2024 13:59
@rikenm1
Copy link
Contributor

rikenm1 commented Jun 20, 2024

can you run the build for AMD64. Looks like amd64 PRcheck build was canceled.

@xordux xordux merged commit 2b8738b into fasttrack/2.0 Jun 23, 2024
21 checks passed
@xordux xordux deleted the rohit/CVE-2024-3727-skopeo branch June 23, 2024 07:53
CBL-Mariner-Bot pushed a commit that referenced this pull request Jun 24, 2024
@xordux @CBL-Mariner-Bot
Fix CVE-2024-3727 in skopeo (#9455)
36fb5b2 
(cherry picked from commit 2b8738b)
@CBL-Mariner-Bot CBL-Mariner-Bot mentioned this pull request Jun 24, 2024
Merged
@CBL-Mariner-Bot
Copy link
Collaborator

Auto cherry-pick results:

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rikenm1 rikenm1 rikenm1 approved these changes

@eric-desrochers eric-desrochers eric-desrochers approved these changes

Assignees
No one assigned
Labels
fasttrack/2.0 PRs Destined for AzureLinux 2.0 security
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@xordux @rikenm1 @CBL-Mariner-Bot @eric-desrochers