Skip to content

[release-4.17] OCPBUGS-103326: Replace golang.org/x/net with sustaining fork for CVE-2026-33814 - #140

Open
atewari-rh wants to merge 1 commit into
openshift:release-4.17from
atewari-rh:CVE-2026-33814_release-4.17
Open

[release-4.17] OCPBUGS-103326: Replace golang.org/x/net with sustaining fork for CVE-2026-33814#140
atewari-rh wants to merge 1 commit into
openshift:release-4.17from
atewari-rh:CVE-2026-33814_release-4.17

Conversation

@atewari-rh

Copy link
Copy Markdown

Summary

Fixes CVE-2026-33814, a High-severity denial-of-service vulnerability in the
golang.org/x/net/http2 implementation (and Go's std-lib vendored copy of
HTTP/2). A malicious peer can send a stream of invalid/oversized HTTP/2
SETTINGS frames that are not properly validated, allowing a DoS against any
process using golang.org/x/net/http2 as either a client or server.

Replace golang.org/x/net with the backported fix published at
github.com/openshift-sustaining/net@v0.35.0-sec.3, which carries the
s.Valid() validation fix on top of the same base already in use, without
requiring a Go toolchain bump.

Changes

  • go.mod / go.sum: replace golang.org/x/net with
    github.com/openshift-sustaining/net v0.35.0-sec.3.
  • providers/go.mod / providers/go.sum: add the same
    replace golang.org/x/net => github.com/openshift-sustaining/net v0.35.0-sec.3
    directive (this module has its own independent vendor/, since
    release-4.17 predates the go.work workspace layout used on newer
    branches).
  • test/e2e/go.mod / test/e2e/go.sum: add the same replace directive.
    This module was still referencing golang.org/x/net without the backported
    fix, so it was updated to stay consistent across all modules.
  • Regenerated vendor/, providers/vendor/, and test/e2e/vendor/ via
    go mod tidy && go mod vendor in each module so the vendored copies of
    golang.org/x/net/http2/{transport,server}.go include the s.Valid()
    check, and vendor/modules.txt in each module correctly records the
    => github.com/openshift-sustaining/net v0.35.0-sec.3 replace.
  • A handful of collateral transitive bumps (x/crypto, x/mod, x/sync,
    x/sys, x/term, x/text, x/tools) pulled in automatically by
    go mod tidy to satisfy the sustaining fork's go.mod requirements.
  • Go toolchain stays aligned with release-4.17 build environment requirements
    — no CI build_root_image / ci-operator.yaml changes needed.

Why not bump the module directly?

Directly bumping to golang.org/x/net v0.53.0 isn't viable here because the
release-4.17 CI build root uses an older Go toolchain version, and x/net
v0.53.0's go.mod requires a newer Go toolchain than is available in this
branch's build environment.

Verification

  • go build ./... passes in the root module, providers/, and the
    test/e2e module trees.
  • Verified s.Valid() fix present in vendor/golang.org/x/net/http2/transport.go
    and server.go in all vendor trees.
  • Verified github.com/openshift-sustaining/net@v0.35.0-sec.3's go.mod
    is compatible with this branch's Go toolchain.

Related

…E-2026-33814 in 4.17

Signed-off-by: atewari <atewari@redhat.com>
@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 Aug 24, 2026
@coderabbitai

coderabbitai Bot commented Aug 24, 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: Pro Plus

Run ID: c816016d-c305-4b4e-9135-c7ffc7990254

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

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.

@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 Aug 24, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@atewari-rh: This pull request references Jira Issue OCPBUGS-103326, which is invalid:

  • expected dependent Jira Issue OCPBUGS-103547 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:

Summary

Fixes CVE-2026-33814, a High-severity denial-of-service vulnerability in the
golang.org/x/net/http2 implementation (and Go's std-lib vendored copy of
HTTP/2). A malicious peer can send a stream of invalid/oversized HTTP/2
SETTINGS frames that are not properly validated, allowing a DoS against any
process using golang.org/x/net/http2 as either a client or server.

Replace golang.org/x/net with the backported fix published at
github.com/openshift-sustaining/net@v0.35.0-sec.3, which carries the
s.Valid() validation fix on top of the same base already in use, without
requiring a Go toolchain bump.

Changes

  • go.mod / go.sum: replace golang.org/x/net with
    github.com/openshift-sustaining/net v0.35.0-sec.3.
  • providers/go.mod / providers/go.sum: add the same
    replace golang.org/x/net => github.com/openshift-sustaining/net v0.35.0-sec.3
    directive (this module has its own independent vendor/, since
    release-4.17 predates the go.work workspace layout used on newer
    branches).
  • test/e2e/go.mod / test/e2e/go.sum: add the same replace directive.
    This module was still referencing golang.org/x/net without the backported
    fix, so it was updated to stay consistent across all modules.
  • Regenerated vendor/, providers/vendor/, and test/e2e/vendor/ via
    go mod tidy && go mod vendor in each module so the vendored copies of
    golang.org/x/net/http2/{transport,server}.go include the s.Valid()
    check, and vendor/modules.txt in each module correctly records the
    => github.com/openshift-sustaining/net v0.35.0-sec.3 replace.
  • A handful of collateral transitive bumps (x/crypto, x/mod, x/sync,
    x/sys, x/term, x/text, x/tools) pulled in automatically by
    go mod tidy to satisfy the sustaining fork's go.mod requirements.
  • Go toolchain stays aligned with release-4.17 build environment requirements
    — no CI build_root_image / ci-operator.yaml changes needed.

Why not bump the module directly?

Directly bumping to golang.org/x/net v0.53.0 isn't viable here because the
release-4.17 CI build root uses an older Go toolchain version, and x/net
v0.53.0's go.mod requires a newer Go toolchain than is available in this
branch's build environment.

Verification

  • go build ./... passes in the root module, providers/, and the
    test/e2e module trees.
  • Verified s.Valid() fix present in vendor/golang.org/x/net/http2/transport.go
    and server.go in all vendor trees.
  • Verified github.com/openshift-sustaining/net@v0.35.0-sec.3's go.mod
    is compatible with this branch's Go toolchain.

Related

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-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 openshift-ci Bot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Aug 24, 2026
@openshift-ci

openshift-ci Bot commented Aug 24, 2026

Copy link
Copy Markdown

Hi @atewari-rh. Thanks for your PR.

I'm waiting for a openshift member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work.

Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@openshift-ci
openshift-ci Bot requested review from RadekManak and elmiko August 24, 2026 07:15
@openshift-ci

openshift-ci Bot commented Aug 24, 2026

Copy link
Copy Markdown

[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 nrb 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

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. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants