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.

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

OCPBUGS-30431: CVE-2024-24786: bump pkg golang protobuf #620

Merged
merged 1 commit into from
Apr 30, 2024

Conversation

martinkennelly
Copy link
Contributor

Executed:
$ go get -u github.com/golang/protobuf@v1.5.4
$ go mod vendor

Unsure if this CVE is actually exploitable - bumping github.com/golang/protobuf from v1.5.3 -> v1.5.4

See: https://bugzilla.redhat.com/show_bug.cgi?id=2268046#c19

@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Mar 15, 2024
@openshift-ci-robot
Copy link
Contributor

@martinkennelly: This pull request references Jira Issue OCPBUGS-30431, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.16.0) matches configured target version for branch (4.16.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @zhaozhanqi

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

Executed:
$ go get -u github.com/golang/protobuf@v1.5.4
$ go mod vendor

Unsure if this CVE is actually exploitable - bumping github.com/golang/protobuf from v1.5.3 -> v1.5.4

See: https://bugzilla.redhat.com/show_bug.cgi?id=2268046#c19

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 openshift-eng/jira-lifecycle-plugin repository.

@danwinship
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Mar 28, 2024
@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD f4cdaa2 and 2 for PR HEAD 64eb330 in total

@danwinship
Copy link
Contributor

`go.sum` content is incorrect - did you run `go mod tidy`?

@martinkennelly
Copy link
Contributor Author

`go.sum` content is incorrect - did you run `go mod tidy`?

🤦

Looks like I didnt...

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Apr 3, 2024
@martinkennelly
Copy link
Contributor Author

Very strange. Running Go mod vendor locally produces no changes to the vendor directory including if i delete that directory and recreate it. The following was added when i exec go mod vendor even though this component wasnt upgraded:

diff --git a/vendor/github.com/containernetworking/plugins/plugins/ipam/host-local/backend/disk/backend.go b/vendor/github.com/containernetworking/plugins/plugins/ipam/host-local/backend/disk/backend.go
index 350f1b501..82c3a8a99 100644
--- a/vendor/github.com/containernetworking/plugins/plugins/ipam/host-local/backend/disk/backend.go
+++ b/vendor/github.com/containernetworking/plugins/plugins/ipam/host-local/backend/disk/backend.go
@@ -56,7 +56,7 @@ func New(network, dataDir string) (*Store, error) {
 
 func (s *Store) Reserve(id string, ip net.IP, rangeID string) (bool, error) {
        fname := filepath.Join(s.dataDir, ip.String())
-       f, err := os.OpenFile(fname, os.O_RDWR|os.O_EXCL|os.O_CREATE, 0600)
+       f, err := os.OpenFile(fname, os.O_RDWR|os.O_EXCL|os.O_CREATE, 0644)
        if os.IsExist(err) {
                return false, nil
        }
@@ -74,7 +74,7 @@ func (s *Store) Reserve(id string, ip net.IP, rangeID string) (bool, error) {
        }
        // store the reserved ip in lastIPFile
        ipfile := filepath.Join(s.dataDir, lastIPFilePrefix+rangeID)
-       err = ioutil.WriteFile(ipfile, []byte(ip.String()), 0600)
+       err = ioutil.WriteFile(ipfile, []byte(ip.String()), 0644)
        if err != nil {
                return false, err
        }

@martinkennelly
Copy link
Contributor Author

/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 3, 2024
@danwinship
Copy link
Contributor

@martinkennelly there's a local patch to containernetworking/plugins to fix a CVE. make update-deps-overrides knows how to deal with it but go mod vendor doesn't.

anyway, current state is correct
/hold cancel
/lgtm

@openshift-ci openshift-ci bot added lgtm Indicates that a PR is ready to be merged. and removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Apr 22, 2024
@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD 0197d0d and 2 for PR HEAD 878c919 in total

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 22, 2024
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Apr 25, 2024
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 25, 2024
@martinkennelly
Copy link
Contributor Author

"Rebased" due to conflicts - executed same commands on top of HEAD as described in OP.

@danwinship
Copy link
Contributor

executed same commands on top of HEAD as described in OP

hm, apparently you got the magic wrong this time; you need to revert the change to vendor/github.com/containernetworking/plugins/plugins/ipam/host-local/backend/disk/backend.go (and then you can run make verify-deps to check the result)

Executed:
$ go get -u github.com/golang/protobuf@v1.5.4
$ go mod tidy
$ go mod vendor

Did not commit changes to vendor/github.com/containernetworking/*.

Signed-off-by: Martin Kennelly <mkennell@redhat.com>
@danwinship
Copy link
Contributor

/retest-required
/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 30, 2024
Copy link
Contributor

openshift-ci bot commented Apr 30, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: danwinship, martinkennelly

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

@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD 0197d0d and 2 for PR HEAD af7fcb7 in total

Copy link
Contributor

openshift-ci bot commented Apr 30, 2024

@martinkennelly: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/security af7fcb7 link false /test security

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

@openshift-merge-bot openshift-merge-bot bot merged commit 5b658c4 into openshift:master Apr 30, 2024
9 of 10 checks passed
@openshift-ci-robot
Copy link
Contributor

@martinkennelly: Jira Issue OCPBUGS-30431: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-30431 has been moved to the MODIFIED state.

In response to this:

Executed:
$ go get -u github.com/golang/protobuf@v1.5.4
$ go mod vendor

Unsure if this CVE is actually exploitable - bumping github.com/golang/protobuf from v1.5.3 -> v1.5.4

See: https://bugzilla.redhat.com/show_bug.cgi?id=2268046#c19

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-node-container-v4.17.0-202404302014.p0.g5b658c4.assembly.stream.el9 for distgit ose-sdn.
All builds following this will include this PR.

@openshift-merge-robot
Copy link
Contributor

Fix included in accepted release 4.16.0-0.nightly-2024-05-01-111315

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. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants