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

🐛 bump google.golang.org/protobuf to v1.33.0 #1608

Merged
merged 1 commit into from
Mar 8, 2024
Merged

🐛 bump google.golang.org/protobuf to v1.33.0 #1608

merged 1 commit into from
Mar 8, 2024

Conversation

tuminoid
Copy link
Member

@tuminoid tuminoid commented Mar 8, 2024

JSON unmarshalling can enter infinite loop.
https://osv.dev/vulnerability/GO-2024-2611

@tuminoid
bump google.golang.org/protobuf to v1.33.0
9a028ae 
JSON unmarshalling can enter infinite loop.
https://osv.dev/vulnerability/GO-2024-2611

Signed-off-by: Tuomo Tanskanen <tuomo.tanskanen@est.tech>
@metal3-io-bot metal3-io-bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Mar 8, 2024
@tuminoid
Copy link
Member Author

tuminoid commented Mar 8, 2024

/test metal3-bmo-e2e-test-pull
/test-centos-e2e-integration-main

@tuminoid
Copy link
Member Author

tuminoid commented Mar 8, 2024

/test-centos-e2e-integration-main
/test-ubuntu-integration-main
Let's see if Cleura is broken

@tuminoid
Copy link
Member Author

tuminoid commented Mar 8, 2024

/test-centos-e2e-integration-main

@dtantsur
Copy link
Member

dtantsur commented Mar 8, 2024

/approve

@metal3-io-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dtantsur

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

The pull request process is described here

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

@metal3-io-bot metal3-io-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 8, 2024
lentzi90
lentzi90 reviewed Mar 8, 2024
View reviewed changes
Copy link
Member

@lentzi90 lentzi90 left a comment

Choose a reason for hiding this comment

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

/lgtm

@metal3-io-bot metal3-io-bot added the lgtm Indicates that a PR is ready to be merged. label Mar 8, 2024
@metal3-io-bot metal3-io-bot merged commit 7a4ba22 into metal3-io:main Mar 8, 2024
21 checks passed
@metal3-io-bot metal3-io-bot deleted the tuomo/bump-protobuf branch March 8, 2024 13:14
@tuminoid
Copy link
Member Author

tuminoid commented Mar 8, 2024

/cherry-pick release-0.5
Let's see if it can be applied, I doubt it.

@metal3-io-bot
Copy link
Contributor

@tuminoid: #1608 failed to apply on top of branch "release-0.5":

Applying: bump google.golang.org/protobuf to v1.33.0
Using index info to reconstruct a base tree...
M	apis/go.mod
M	apis/go.sum
M	go.mod
M	go.sum
M	hack/tools/go.mod
M	hack/tools/go.sum
M	test/go.mod
M	test/go.sum
Falling back to patching base and 3-way merge...
Auto-merging test/go.sum
CONFLICT (content): Merge conflict in test/go.sum
Auto-merging test/go.mod
CONFLICT (content): Merge conflict in test/go.mod
Auto-merging hack/tools/go.sum
Auto-merging hack/tools/go.mod
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging apis/go.sum
CONFLICT (content): Merge conflict in apis/go.sum
Auto-merging apis/go.mod
CONFLICT (content): Merge conflict in apis/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 bump google.golang.org/protobuf to v1.33.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".

In response to this:

/cherry-pick release-0.5
Let's see if it can be applied, I doubt it.

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.

@tuminoid
Copy link
Member Author

tuminoid commented Mar 8, 2024

OK, I'll do it manually.

@tuminoid tuminoid mentioned this pull request Mar 8, 2024
Merged
tuminoid added a commit to Nordix/baremetal-operator that referenced this pull request Mar 8, 2024
@tuminoid
bump google.golang.org/protobuf to v1.33.0
102d234 
JSON unmarshalling can enter infinite loop.
https://osv.dev/vulnerability/GO-2024-2611

Manual cherry-pick of metal3-io#1608

Signed-off-by: Tuomo Tanskanen <tuomo.tanskanen@est.tech>
@tuminoid tuminoid mentioned this pull request Mar 8, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lentzi90 lentzi90 lentzi90 left review comments

Assignees
No one assigned
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. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@tuminoid @dtantsur @metal3-io-bot @lentzi90