Skip to content

[release-4.15] OCPBUGS-102805: CVE-2026-33814: replace golang.org/x/net with openshift-sustaining fork - #10837

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

[release-4.15] OCPBUGS-102805: CVE-2026-33814: replace golang.org/x/net with openshift-sustaining fork#10837
mariocr73 wants to merge 1 commit into
openshift:release-4.15from
mariocr73:ocpbugs-102805-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.20, 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.35.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). This branch already pinned golang.org/x/net via a direct replace; that replace was repointed to the fork tag instead of adding a second one (Go only allows one replace per module path).

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

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

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

Copy link
Copy Markdown
Contributor

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

  • expected Jira Issue OCPBUGS-102805 to depend on a bug targeting a version in 4.16.0, 4.16.z and in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but no dependents were found

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.20, 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.35.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). This branch already pinned golang.org/x/net via a direct replace; that replace was repointed to the fork tag instead of adding a second one (Go only allows one replace per module path).

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.

@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: cd48d649-937a-42d1-8fab-c896a0405a2f

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
openshift-ci Bot requested review from AnnaZivkovic and r4f4 September 1, 2026 04:14
@openshift-ci

openshift-ci Bot commented Sep 1, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign rna-afk for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found 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

@mariocr73
mariocr73 force-pushed the ocpbugs-102805-cve-2026-33814-xnet-replace-fork branch from 99217e1 to 636ba60 Compare September 1, 2026 17:57
…ift-sustaining fork

Co-authored-by: Cursor <cursoragent@cursor.com>
@mariocr73
mariocr73 force-pushed the ocpbugs-102805-cve-2026-33814-xnet-replace-fork branch from 636ba60 to 010d00a Compare September 1, 2026 20:31
@openshift-ci

openshift-ci Bot commented Sep 1, 2026

Copy link
Copy Markdown
Contributor

@mariocr73: 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/images 010d00a link true /test images

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

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.

2 participants