Skip to content

OCPBUGS-80311,OCPBUGS-80312,OCPBUGS-80313: Fix CVE-2026-33186 with openshift-sustaining/grpc-go v1.71.3-sec.1 [release-4.18] - #1314

Merged
openshift-merge-bot[bot] merged 1 commit into
openshift:release-4.18from
rissh:CVE-2026-33186-4.18
Jun 4, 2026
Merged

OCPBUGS-80311,OCPBUGS-80312,OCPBUGS-80313: Fix CVE-2026-33186 with openshift-sustaining/grpc-go v1.71.3-sec.1 [release-4.18]#1314
openshift-merge-bot[bot] merged 1 commit into
openshift:release-4.18from
rissh:CVE-2026-33186-4.18

Conversation

@rissh

@rissh rissh commented Jun 3, 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.18 and refreshes the root vendor/ tree accordingly.

release-4.18 builds with Go 1.22 (see .ci-operator.yaml). Upstream google.golang.org/grpc v1.79.3 (the patched upstream release) requires Go 1.24, so this PR uses the OpenShift sustaining backport v1.71.3-sec.1 for Go 1.22.

For this branch, we removed the legacy grpc downgrade replace (google.golang.org/grpc => v1.63.2) and replaced it with:

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

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

Scope matches the release-4.19/4.20 workflow: product modules + vendor/ only (no tests-extension on this branch).

Reference links

Test plan

  • go list -m google.golang.org/grpcv1.70.0 => github.com/openshift-sustaining/grpc-go v1.71.3-sec.1
  • No v1.63.2 in vendor/modules.txt
  • go test ./pkg/controller/registry/grpc/... (OLM)
  • OpenShift CI (e.g. e2e-gcp-olm)

@coderabbitai

coderabbitai Bot commented Jun 3, 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: 214ad45b-b597-4819-9feb-f470104b0cbe

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.

@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/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Jun 3, 2026
@openshift-ci-robot

Copy link
Copy Markdown

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

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.18.z) matches configured target version for branch (4.18.z)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note type set to "Release Note Not Required"
  • dependent bug Jira Issue OCPBUGS-80492 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-80492 targets the "4.19.z" version, which is one of the valid target versions: 4.19.0, 4.19.z
  • bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira (ocp-sustaining-admins@redhat.com), skipping review request.

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

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

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.18.z) matches configured target version for branch (4.18.z)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note type set to "Release Note Not Required"
  • dependent bug Jira Issue OCPBUGS-80493 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-80493 targets the "4.19.z" version, which is one of the valid target versions: 4.19.0, 4.19.z
  • bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira (ocp-sustaining-admins@redhat.com), skipping review request.

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

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

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.18.z) matches configured target version for branch (4.18.z)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note type set to "Release Note Not Required"
  • dependent bug Jira Issue OCPBUGS-80494 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-80494 targets the "4.19.z" version, which is one of the valid target versions: 4.19.0, 4.19.z
  • bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira (ocp-sustaining-admins@redhat.com), skipping review request.

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.18 and refreshes the root vendor/ tree accordingly.

release-4.18 builds with Go 1.22 (see .ci-operator.yaml). Upstream google.golang.org/grpc v1.79.3 (the patched upstream release) requires Go 1.24, so this PR uses the OpenShift sustaining backport v1.71.3-sec.1 for Go 1.22.

For this branch, we removed the legacy grpc downgrade replace (google.golang.org/grpc => v1.63.2) and replaced it with:

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

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

Scope matches the release-4.19/4.20 workflow: product modules + vendor/ only (no tests-extension on this branch).

Reference links

Test plan

  • go list -m google.golang.org/grpcv1.70.0 => github.com/openshift-sustaining/grpc-go v1.71.3-sec.1
  • No v1.63.2 in vendor/modules.txt
  • go test ./pkg/controller/registry/grpc/... (OLM)
  • 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.

@openshift-ci
openshift-ci Bot requested review from joelanford and tmshort June 3, 2026 06:28
@openshift-ci

openshift-ci Bot commented Jun 3, 2026

Copy link
Copy Markdown
Contributor

@rissh: all tests passed!

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.

@MrSanketkumar

Copy link
Copy Markdown

/jira refresh

@openshift-ci-robot

Copy link
Copy Markdown

@MrSanketkumar: This pull request references Jira Issue OCPBUGS-80311, which is valid.

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.18.z) matches configured target version for branch (4.18.z)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note type set to "Release Note Not Required"
  • dependent bug Jira Issue OCPBUGS-80492 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-80492 targets the "4.19.z" version, which is one of the valid target versions: 4.19.0, 4.19.z
  • bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira (ocp-sustaining-admins@redhat.com), skipping review request.

This pull request references Jira Issue OCPBUGS-80312, which is valid.

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.18.z) matches configured target version for branch (4.18.z)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note type set to "Release Note Not Required"
  • dependent bug Jira Issue OCPBUGS-80493 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-80493 targets the "4.19.z" version, which is one of the valid target versions: 4.19.0, 4.19.z
  • bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira (ocp-sustaining-admins@redhat.com), skipping review request.

This pull request references Jira Issue OCPBUGS-80313, which is valid.

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.18.z) matches configured target version for branch (4.18.z)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note type set to "Release Note Not Required"
  • dependent bug Jira Issue OCPBUGS-80494 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-80494 targets the "4.19.z" version, which is one of the valid target versions: 4.19.0, 4.19.z
  • bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira (ocp-sustaining-admins@redhat.com), skipping review request.

Details

In response to this:

/jira refresh

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.

@MrSanketkumar

Copy link
Copy Markdown

/verified by CI
Checked the all go.mod file. All are using gRPC forked version.

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Jun 3, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@MrSanketkumar: This PR has been marked as verified by CI.

Details

In response to this:

/verified by CI
Checked the all go.mod file. All are using gRPC forked version.

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.

@rissh

rissh commented Jun 3, 2026

Copy link
Copy Markdown
Author

@perdasilva @tmshort Could you please review the PR when you get a chance?

@tmshort

tmshort commented Jun 4, 2026

Copy link
Copy Markdown
Contributor

/approve

@openshift-ci

openshift-ci Bot commented Jun 4, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

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

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 4, 2026
@shannon

shannon commented Jun 4, 2026

Copy link
Copy Markdown

/label backport-risk-assessed
/lgtm

@openshift-ci openshift-ci Bot added lgtm Indicates that a PR is ready to be merged. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. labels Jun 4, 2026
@openshift-merge-bot
openshift-merge-bot Bot merged commit f3a32b0 into openshift:release-4.18 Jun 4, 2026
12 checks passed
@openshift-ci-robot

Copy link
Copy Markdown

@rissh: Jira Issue Verification Checks: Jira Issue OCPBUGS-80311
✔️ This pull request was pre-merge verified.
✔️ All associated pull requests have merged.
✔️ All associated, merged pull requests were pre-merge verified.

Jira Issue OCPBUGS-80311 has been moved to the MODIFIED state and will move to the VERIFIED state when the change is available in an accepted nightly payload. 🕓

Jira Issue Verification Checks: Jira Issue OCPBUGS-80312
✔️ This pull request was pre-merge verified.
✔️ All associated pull requests have merged.
✔️ All associated, merged pull requests were pre-merge verified.

Jira Issue OCPBUGS-80312 has been moved to the MODIFIED state and will move to the VERIFIED state when the change is available in an accepted nightly payload. 🕓

Jira Issue Verification Checks: Jira Issue OCPBUGS-80313
✔️ This pull request was pre-merge verified.
✔️ All associated pull requests have merged.
✔️ All associated, merged pull requests were pre-merge verified.

Jira Issue OCPBUGS-80313 has been moved to the MODIFIED state and will move to the VERIFIED state when the change is available in an accepted nightly payload. 🕓

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.18 and refreshes the root vendor/ tree accordingly.

release-4.18 builds with Go 1.22 (see .ci-operator.yaml). Upstream google.golang.org/grpc v1.79.3 (the patched upstream release) requires Go 1.24, so this PR uses the OpenShift sustaining backport v1.71.3-sec.1 for Go 1.22.

For this branch, we removed the legacy grpc downgrade replace (google.golang.org/grpc => v1.63.2) and replaced it with:

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

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

Scope matches the release-4.19/4.20 workflow: product modules + vendor/ only (no tests-extension on this branch).

Reference links

Test plan

  • go list -m google.golang.org/grpcv1.70.0 => github.com/openshift-sustaining/grpc-go v1.71.3-sec.1
  • No v1.63.2 in vendor/modules.txt
  • go test ./pkg/controller/registry/grpc/... (OLM)
  • 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.

@openshift-merge-robot

Copy link
Copy Markdown
Contributor

Fix included in release 4.18.0-0.nightly-2026-06-05-010648

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. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. 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. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants