Skip to content

[release-4.21] OCPBUGS-104157: CVE-2026-33814: replace golang.org/x/net with openshift-sustaining fork - #425

Open
mariocr73 wants to merge 1 commit into
openshift:release-4.21from
mariocr73:ocpbugs-104157-cve-2026-33814-xnet-replace-fork
Open

[release-4.21] OCPBUGS-104157: CVE-2026-33814: replace golang.org/x/net with openshift-sustaining fork#425
mariocr73 wants to merge 1 commit into
openshift:release-4.21from
mariocr73:ocpbugs-104157-cve-2026-33814-xnet-replace-fork

Conversation

@mariocr73

Copy link
Copy Markdown

golang.org/x/net's real fix for CVE-2026-33814 (GO-2026-4918, malformed SETTINGS_MAX_FRAME_SIZE causing an infinite loop in golang.org/x/net/http2) ships in v0.53.0, which requires go>=1.25. This branch's go.mod declares go 1.24.0, so a direct module bump is not buildable here without also bumping the builder toolchain.

Uses replace golang.org/x/net => github.com/openshift-sustaining/net v0.50.0-sec.3 (the sustaining team's own downstream fork) which backports only the CVE-2026-33814 fix without requiring a toolchain bump. Same mechanism already used by other components in this CVE (e.g. openshift/csi-operator, openshift/azure-disk-csi-driver-operator, openshift/route-controller-manager).

Verified: go build ./... and go vet ./... pass with this branch's real toolchain; govulncheck no longer reports GO-2026-4918 for this module.

…ift-sustaining fork

golang.org/x/net's real fix (v0.53.0) requires a newer Go toolchain than
this branch's builder image provides. Use the openshift-sustaining/net
fork tag v0.50.0-sec.3, which backports the GO-2026-4918 fix
(CVE-2026-33814, malformed SETTINGS_MAX_FRAME_SIZE causing an infinite
loop in golang.org/x/net/http2) without bumping the go directive.

Verified: go build ./... and go vet ./... pass; govulncheck no longer
reports GO-2026-4918 for this module.
@openshift-merge-bot

Copy link
Copy Markdown

Pipeline controller notification
This repo is configured to use the pipeline controller. Second-stage tests will be triggered either automatically or after lgtm label is added, depending on the repository configuration. The pipeline controller will automatically detect which contexts are required and will utilize /test Prow commands to trigger the second stage.

For optional jobs, comment /test ? to see a list of all defined jobs. To trigger manually all jobs from second stage use /pipeline required command.

This repository is configured in: LGTM mode

@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. labels Sep 1, 2026
@coderabbitai

coderabbitai Bot commented Sep 1, 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: Team

Run ID: 9a113be9-c0af-443a-82bf-0617b7a1fa79

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

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

@openshift-ci-robot openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Sep 1, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@mariocr73: This pull request references Jira Issue OCPBUGS-104157, which is invalid:

  • expected dependent Jira Issue OCPBUGS-101997 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is POST 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:

golang.org/x/net's real fix for CVE-2026-33814 (GO-2026-4918, malformed SETTINGS_MAX_FRAME_SIZE causing an infinite loop in golang.org/x/net/http2) ships in v0.53.0, which requires go>=1.25. This branch's go.mod declares go 1.24.0, so a direct module bump is not buildable here without also bumping the builder toolchain.

Uses replace golang.org/x/net => github.com/openshift-sustaining/net v0.50.0-sec.3 (the sustaining team's own downstream fork) which backports only the CVE-2026-33814 fix without requiring a toolchain bump. Same mechanism already used by other components in this CVE (e.g. openshift/csi-operator, openshift/azure-disk-csi-driver-operator, openshift/route-controller-manager).

Verified: go build ./... and go vet ./... pass with this branch's real toolchain; govulncheck no longer reports GO-2026-4918 for this module.

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 gryf and stephenfin September 1, 2026 04:23
@mandre

mandre commented Sep 1, 2026

Copy link
Copy Markdown
Member

/test e2e-openstack

@mandre

mandre commented Sep 1, 2026

Copy link
Copy Markdown
Member

Not sure why I had to manually trigger the e2e-openstack job... it looks like recent changes to the ci configuration in release are to blame (openshift/release#83166 being a prime suspect).

@mandre

mandre commented Sep 1, 2026

Copy link
Copy Markdown
Member

Ahhh, it seems like with this new config, e2e-openstack is now supposed to run after the first /lgtm.

@mandre mandre left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Sep 1, 2026
@openshift-merge-bot

Copy link
Copy Markdown

Pipeline controller notification

No second-stage tests were triggered for this PR.

This can happen when:

  • The changed files don't match any pipeline_run_if_changed patterns
  • All files match pipeline_skip_if_only_changed patterns
  • No pipeline-controlled jobs are defined for the release-4.21 branch

Use /test ? to see all available tests.

@openshift-ci

openshift-ci Bot commented Sep 1, 2026

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mandre, mariocr73

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 Sep 1, 2026
@openshift-ci

openshift-ci Bot commented Sep 1, 2026

Copy link
Copy Markdown

@mariocr73: 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/security 3bc8414 link false /test security
ci/prow/e2e-openstack 3bc8414 link true /test e2e-openstack

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. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants