Skip to content

OCPBUGS-79906,OCPBUGS-87895: Fix CVE-2026-33186 with openshift-sustaining/grpc-go v1.64.1-sec.1 [release-4.15]#1325

Open
rissh wants to merge 1 commit into
openshift:release-4.15from
rissh:CVE-2026-33186-4.15
Open

OCPBUGS-79906,OCPBUGS-87895: Fix CVE-2026-33186 with openshift-sustaining/grpc-go v1.64.1-sec.1 [release-4.15]#1325
rissh wants to merge 1 commit into
openshift:release-4.15from
rissh:CVE-2026-33186-4.15

Conversation

@rissh

@rissh rissh commented Jun 10, 2026

Copy link
Copy Markdown

PR description

This change addresses CVE-2026-33186 / GHSA-p77j-4mvh-x3m3 / GO-2026-4762 in product Go modules for release-4.15 and refreshes the root vendor/ tree accordingly.

release-4.15 builds with Go 1.20 (see .ci-operator.yaml). Upstream google.golang.org/grpc v1.79.3 requires Go 1.24, so this PR uses the OpenShift sustaining backport v1.64.1-sec.1. There is no Go 1.20-specific sustaining tag; v1.64.1-sec.1 (Go 1.19 backport) is the approved choice for Go 1.20 product lines per sustaining team guidance.

Unlike release-4.17+, this branch had no existing grpc replace (baseline vendored grpc was v1.60.1). This PR adds:

replace google.golang.org/grpc => github.com/openshift-sustaining/grpc-go v1.64.1-sec.1

in the root go.mod and staging/operator-lifecycle-manager/go.mod, so the effective vendored grpc is patched.

Scope matches release-4.16/4.17/4.18/4.19 workflow: product modules + vendor/ only (no tests-extension on this branch). No source changes; existing Conn.Connect() mitigation in OLM catalog grpc client remains unchanged.

Reference links

Test plan

  • go list -m google.golang.org/grpcv1.62.1 => github.com/openshift-sustaining/grpc-go v1.64.1-sec.1
  • No v1.60.1 in vendor/modules.txt
  • go test ./pkg/controller/registry/grpc/... (OLM)
  • go mod verify
  • go build -mod=vendor for cmd/olm and cmd/catalog
  • OpenShift CI (e.g. e2e-gcp-olm)

@openshift-ci-robot openshift-ci-robot added jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jun 10, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@rissh: This pull request references Jira Issue OCPBUGS-79906, which is invalid:

  • expected dependent Jira Issue OCPBUGS-79981 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is ASSIGNED instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

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

This pull request references Jira Issue OCPBUGS-87895, which is invalid:

  • expected dependent Jira Issue OCPBUGS-87898 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is ASSIGNED instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

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

Details

In response to this:

PR description

This change addresses CVE-2026-33186 / GHSA-p77j-4mvh-x3m3 / GO-2026-4762 in product Go modules for release-4.15 and refreshes the root vendor/ tree accordingly.

release-4.15 builds with Go 1.20 (see .ci-operator.yaml). Upstream google.golang.org/grpc v1.79.3 requires Go 1.24, so this PR uses the OpenShift sustaining backport v1.64.1-sec.1. There is no Go 1.20-specific sustaining tag; v1.64.1-sec.1 (Go 1.19 backport) is the approved choice for Go 1.20 product lines per sustaining team guidance.

Unlike release-4.17+, this branch had no existing grpc replace (baseline vendored grpc was v1.60.1). This PR adds:

replace google.golang.org/grpc => github.com/openshift-sustaining/grpc-go v1.64.1-sec.1

in the root go.mod and staging/operator-lifecycle-manager/go.mod, so the effective vendored grpc is patched.

Scope matches release-4.16/4.17/4.18/4.19 workflow: product modules + vendor/ only (no tests-extension on this branch). No source changes; existing Conn.Connect() mitigation in OLM catalog grpc client remains unchanged.

Reference links

Test plan

  • go list -m google.golang.org/grpcv1.62.1 => github.com/openshift-sustaining/grpc-go v1.64.1-sec.1
  • No v1.60.1 in vendor/modules.txt
  • go test ./pkg/controller/registry/grpc/... (OLM)
  • go mod verify
  • go build -mod=vendor for cmd/olm and cmd/catalog
  • OpenShift CI (e.g. e2e-gcp-olm)

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.

@coderabbitai

coderabbitai Bot commented Jun 10, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: 807d5065-6334-49ed-965d-f5d2f164bfa2

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@rissh

rissh commented Jun 10, 2026

Copy link
Copy Markdown
Author

Note on sustaining grpc version (Go 1.20 / v1.64.1-sec.1)

  • release-4.15 builds with Go 1.20 (rhel-9-release-golang-1.20-openshift-4.15).
  • There is no Go 1.20-specific openshift-sustaining grpc tag, so this PR uses v1.64.1-sec.1 — the Go 1.19 CVE backport — per sustaining team guidance.
  • The Go 1.20 toolchain is compatible with that module’s go 1.19 minimum; newer sustaining tags (e.g. v1.67.3-sec.1) require Go 1.21+ and are not usable here.

@perdasilva

Copy link
Copy Markdown
Contributor

/retest

@perdasilva

Copy link
Copy Markdown
Contributor

/approve

@openshift-ci

openshift-ci Bot commented Jun 12, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: perdasilva, rissh

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

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 12, 2026
@openshift-ci

openshift-ci Bot commented Jun 12, 2026

Copy link
Copy Markdown
Contributor

@rissh: The following tests 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/e2e-gcp-console-olm 15f0e92 link true /test e2e-gcp-console-olm
ci/prow/e2e-gcp-olm 15f0e92 link true /test e2e-gcp-olm

Full PR test history. Your PR dashboard.

Details

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

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/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants