Skip to content

Conversation

@vdemeester
Copy link
Member

Changes

Fixing a critical CVE.
See GHSA-v778-237x-gjrc

/cc @savitaashture @PuneetPunamiya @jkandasa @jkhelil

Submitter Checklist

These are the criteria that every PR should meet, please check them off as you
review them:

See the contribution guide for more details.

Release Notes

Upgrade golang.org/x/crypto to 0.31.0 to fix CVE-2024-45337

Fixing a critical CVE.
See GHSA-v778-237x-gjrc

Signed-off-by: Vincent Demeester <vdemeest@redhat.com>
@tekton-robot tekton-robot added the release-note Denotes a PR that will be considered when it comes time to generate release notes. label Dec 16, 2024
@tekton-robot tekton-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Dec 16, 2024
@PuneetPunamiya
Copy link
Member

/approve

@tekton-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: PuneetPunamiya

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@tekton-robot tekton-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 16, 2024
Copy link
Contributor

@savitaashture savitaashture left a comment

Choose a reason for hiding this comment

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

/lgtm

@tekton-robot tekton-robot added the lgtm Indicates that a PR is ready to be merged. label Dec 16, 2024
@tekton-robot tekton-robot merged commit d14607e into tektoncd:main Dec 16, 2024
8 checks passed
@PuneetPunamiya
Copy link
Member

/cherry-pick release-v0.73.x

@PuneetPunamiya
Copy link
Member

/cherry-pick release-v0.74.x

@tekton-robot
Copy link
Contributor

@PuneetPunamiya: #2454 failed to apply on top of branch "release-v0.73.x":

Applying: Upgrade golang.org/x/crypto to 0.31.0
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	vendor/golang.org/x/sys/cpu/cpu_linux_arm64.go
M	vendor/golang.org/x/sys/unix/mkerrors.sh
M	vendor/golang.org/x/sys/unix/syscall_linux.go
M	vendor/golang.org/x/sys/unix/zerrors_linux.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_386.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_loong64.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go
M	vendor/golang.org/x/sys/unix/zsyscall_linux.go
M	vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go
M	vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go
M	vendor/golang.org/x/sys/unix/zsysnum_linux_loong64.go
M	vendor/golang.org/x/sys/unix/zsysnum_linux_riscv64.go
M	vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go
M	vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go
M	vendor/golang.org/x/sys/unix/ztypes_linux.go
M	vendor/golang.org/x/sys/windows/syscall_windows.go
M	vendor/golang.org/x/sys/windows/types_windows.go
M	vendor/golang.org/x/sys/windows/zsyscall_windows.go
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
Auto-merging vendor/golang.org/x/sys/windows/zsyscall_windows.go
Auto-merging vendor/golang.org/x/sys/windows/types_windows.go
Auto-merging vendor/golang.org/x/sys/windows/syscall_windows.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/ztypes_linux.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_riscv64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_loong64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_linux.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_loong64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_386.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_linux.go
Auto-merging vendor/golang.org/x/sys/unix/mkerrors.sh
Auto-merging vendor/golang.org/x/sys/cpu/cpu_linux_arm64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/cpu/cpu_linux_arm64.go
Removing vendor/golang.org/x/crypto/sha3/xor.go
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Upgrade golang.org/x/crypto to 0.31.0
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Details

In response to this:

/cherry-pick release-v0.73.x

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@tekton-robot
Copy link
Contributor

@PuneetPunamiya: new pull request created: #2455

Details

In response to this:

/cherry-pick release-v0.74.x

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@jkhelil
Copy link
Member

jkhelil commented Dec 16, 2024

/approve

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

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants