Skip to content

[Deepin-Kernel-SIG] [linux 6.18-y] config: disable INET{6}_ESPINTCP #1741

Merged
opsiff merged 1 commit into
deepin-community:linux-6.18.yfrom
opsiff:linux-6.18.y-2026-05-16-config
May 16, 2026
Merged

[Deepin-Kernel-SIG] [linux 6.18-y] config: disable INET{6}_ESPINTCP #1741
opsiff merged 1 commit into
deepin-community:linux-6.18.yfrom
opsiff:linux-6.18.y-2026-05-16-config

Conversation

@opsiff
Copy link
Copy Markdown
Member

@opsiff opsiff commented May 16, 2026

deepin inclusion
category: bugfix

Temporary disable these configs to mitigate this vulnerability from CVE-2026-46300.

(cherry picked from commit c7fae3b)

Summary by Sourcery

Disable INET and INET6 ESP-in-TCP options in desktop defconfigs to mitigate CVE-2026-46300 across supported architectures.

Bug Fixes:

  • Temporarily turn off INET and INET6 ESP-in-TCP kernel configuration options to mitigate CVE-2026-46300 in desktop kernels.

Build:

  • Update arm64 and loongarch desktop defconfig files to reflect the disabled ESP-in-TCP networking options.

deepin inclusion
category: bugfix

Temporary disable these configs to mitigate this vulnerability from
CVE-2026-46300.

Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
(cherry picked from commit c7fae3b)
Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
@sourcery-ai
Copy link
Copy Markdown

sourcery-ai Bot commented May 16, 2026

Reviewer's guide (collapsed on small PRs)

Reviewer's Guide

Temporarily disables the INET_ESPINTCP and INET6_ESPINTCP kernel configuration options in Deepin’s arm64 and loongarch desktop defconfigs to mitigate CVE-2026-46300.

File-Level Changes

Change Details Files
Disable ESP-in-TCP options for IPv4 and IPv6 in Deepin desktop defconfig kernels as a temporary mitigation for CVE-2026-46300.
  • Unset or comment out INET_ESPINTCP in the arm64 desktop defconfig so the feature is no longer built into the kernel.
  • Unset or comment out INET6_ESPINTCP in the arm64 desktop defconfig to disable the IPv6 variant.
  • Apply the same disabling of INET_ESPINTCP to the loongarch desktop defconfig.
  • Apply the same disabling of INET6_ESPINTCP to the loongarch desktop defconfig.
arch/arm64/configs/deepin_arm64_desktop_defconfig
arch/loongarch/configs/deepin_loongarch_desktop_defconfig

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

@Avenger-285714
Copy link
Copy Markdown
Member

Please remember to clean up this configuration item across all architectures after the release to maintain consistency.

Copy link
Copy Markdown

@sourcery-ai sourcery-ai Bot left a comment

Choose a reason for hiding this comment

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

Hey - I've reviewed your changes and they look great!


Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

@Avenger-285714
Copy link
Copy Markdown
Member

/approve

@deepin-ci-robot
Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Avenger-285714

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

Copy link
Copy Markdown

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

This pull request updates Deepin desktop kernel defconfigs to mitigate CVE-2026-46300 by disabling the ESP-in-TCP configuration options for IPv4/IPv6 IPsec.

Changes:

  • Remove CONFIG_INET_ESPINTCP from the LoongArch desktop defconfig.
  • Remove CONFIG_INET6_ESPINTCP from the LoongArch and arm64 desktop defconfigs.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.

File Description
arch/loongarch/configs/deepin_loongarch_desktop_defconfig Stops forcing IPv4/IPv6 ESP-in-TCP on in the LoongArch desktop kernel config.
arch/arm64/configs/deepin_arm64_desktop_defconfig Stops forcing IPv6 ESP-in-TCP on in the arm64 desktop kernel config.
Comments suppressed due to low confidence (1)

arch/loongarch/configs/deepin_loongarch_desktop_defconfig:239

  • Same as IPv4: removing CONFIG_INET6_ESPINTCP from the defconfig relies on current Kconfig defaults. To ensure the mitigation remains effective, explicitly disable it here (e.g., “# CONFIG_INET6_ESPINTCP is not set”).
CONFIG_INET6_AH=m
CONFIG_INET6_ESP=m
CONFIG_INET6_ESP_OFFLOAD=m
CONFIG_INET6_IPCOMP=m

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@@ -211,7 +211,6 @@ CONFIG_NET_FOU_IP_TUNNELS=y
CONFIG_INET_AH=m
CONFIG_INET_ESP=m
CONFIG_INET_ESP_OFFLOAD=m
@@ -299,7 +299,6 @@ CONFIG_IPV6_ROUTE_INFO=y
CONFIG_INET6_AH=m
CONFIG_INET6_ESP=m
CONFIG_INET6_ESP_OFFLOAD=m
@opsiff opsiff merged commit caaba8d into deepin-community:linux-6.18.y May 16, 2026
11 of 16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants