Drop lib-kconfig.ubsan-remove-default-ubsan-from-ubsan_in.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-6.12/lib-kconfig.ubsan-remove-default-ubsan-from-ubsan_in.patch b/queue-6.12/lib-kconfig.ubsan-remove-default-ubsan-from-ubsan_in.patch
deleted file mode 100644 (file)
index e78b74d..0000000
--- a/queue-6.12/lib-kconfig.ubsan-remove-default-ubsan-from-ubsan_in.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 2ea323443a3ac6a3ceabe0ed4dfa37d31d663c8e Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 14 Apr 2025 15:00:59 -0700
-Subject: lib/Kconfig.ubsan: Remove 'default UBSAN' from UBSAN_INTEGER_WRAP
-
-From: Nathan Chancellor <nathan@kernel.org>
-
-[ Upstream commit cdc2e1d9d929d7f7009b3a5edca52388a2b0891f ]
-
-CONFIG_UBSAN_INTEGER_WRAP is 'default UBSAN', which is problematic for a
-couple of reasons.
-
-The first is that this sanitizer is under active development on the
-compiler side to come up with a solution that is maintainable on the
-compiler side and usable on the kernel side. As a result of this, there
-are many warnings when the sanitizer is enabled that have no clear path
-to resolution yet but users may see them and report them in the meantime.
-
-The second is that this option was renamed from
-CONFIG_UBSAN_SIGNED_WRAP, meaning that if a configuration has
-CONFIG_UBSAN=y but CONFIG_UBSAN_SIGNED_WRAP=n and it is upgraded via
-olddefconfig (common in non-interactive scenarios such as CI),
-CONFIG_UBSAN_INTEGER_WRAP will be silently enabled again.
-
-Remove 'default UBSAN' from CONFIG_UBSAN_INTEGER_WRAP until it is ready
-for regular usage and testing from a broader community than the folks
-actively working on the feature.
-
-Cc: stable@vger.kernel.org
-Fixes: 557f8c582a9b ("ubsan: Reintroduce signed overflow sanitizer")
-Signed-off-by: Nathan Chancellor <nathan@kernel.org>
-Link: https://lore.kernel.org/r/20250414-drop-default-ubsan-integer-wrap-v1-1-392522551d6b@kernel.org
-Signed-off-by: Kees Cook <kees@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- lib/Kconfig.ubsan | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/lib/Kconfig.ubsan b/lib/Kconfig.ubsan
-index 63e5622010e0f..37b2839bd442f 100644
---- a/lib/Kconfig.ubsan
-+++ b/lib/Kconfig.ubsan
-@@ -118,7 +118,6 @@ config UBSAN_UNREACHABLE
- 
- config UBSAN_INTEGER_WRAP
-       bool "Perform checking for integer arithmetic wrap-around"
--      default UBSAN
-       depends on !COMPILE_TEST
-       depends on $(cc-option,-fsanitize=signed-integer-overflow)
-       depends on $(cc-option,-fsanitize=unsigned-integer-overflow)
--- 
-2.39.5
-

diff --git a/queue-6.12/series b/queue-6.12/series
index a65f2fe89ced0fa2cfcacbcbe97800b3e27e66f9..66406f57784a5bdf4824ad81513eff3c84ed05e8 100644 (file)
--- a/queue-6.12/series
+++ b/queue-6.12/series
@@ -33,7 +33,6 @@ pci-msi-handle-the-nomask-flag-correctly-for-all-pci.patch
 pci-msi-add-an-option-to-write-msix-entry_data-befor.patch
 accel-ivpu-add-auto-selection-logic-for-job-schedule.patch
 accel-ivpu-fix-the-npu-s-dpu-frequency-calculation.patch
-lib-kconfig.ubsan-remove-default-ubsan-from-ubsan_in.patch
 ksmbd-use-__gfp_retry_mayfail.patch
 ksmbd-add-netdev-up-down-event-debug-print.patch
 ksmbd-browse-interfaces-list-on-fsctl_query_interfac.patch

diff --git a/queue-6.14/lib-kconfig.ubsan-remove-default-ubsan-from-ubsan_in.patch b/queue-6.14/lib-kconfig.ubsan-remove-default-ubsan-from-ubsan_in.patch
deleted file mode 100644 (file)
index 2ccfcf3..0000000
--- a/queue-6.14/lib-kconfig.ubsan-remove-default-ubsan-from-ubsan_in.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 559e377ae6ac36746e3d33d8d6a0f65c11bfe0fb Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 14 Apr 2025 15:00:59 -0700
-Subject: lib/Kconfig.ubsan: Remove 'default UBSAN' from UBSAN_INTEGER_WRAP
-
-From: Nathan Chancellor <nathan@kernel.org>
-
-[ Upstream commit cdc2e1d9d929d7f7009b3a5edca52388a2b0891f ]
-
-CONFIG_UBSAN_INTEGER_WRAP is 'default UBSAN', which is problematic for a
-couple of reasons.
-
-The first is that this sanitizer is under active development on the
-compiler side to come up with a solution that is maintainable on the
-compiler side and usable on the kernel side. As a result of this, there
-are many warnings when the sanitizer is enabled that have no clear path
-to resolution yet but users may see them and report them in the meantime.
-
-The second is that this option was renamed from
-CONFIG_UBSAN_SIGNED_WRAP, meaning that if a configuration has
-CONFIG_UBSAN=y but CONFIG_UBSAN_SIGNED_WRAP=n and it is upgraded via
-olddefconfig (common in non-interactive scenarios such as CI),
-CONFIG_UBSAN_INTEGER_WRAP will be silently enabled again.
-
-Remove 'default UBSAN' from CONFIG_UBSAN_INTEGER_WRAP until it is ready
-for regular usage and testing from a broader community than the folks
-actively working on the feature.
-
-Cc: stable@vger.kernel.org
-Fixes: 557f8c582a9b ("ubsan: Reintroduce signed overflow sanitizer")
-Signed-off-by: Nathan Chancellor <nathan@kernel.org>
-Link: https://lore.kernel.org/r/20250414-drop-default-ubsan-integer-wrap-v1-1-392522551d6b@kernel.org
-Signed-off-by: Kees Cook <kees@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- lib/Kconfig.ubsan | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/lib/Kconfig.ubsan b/lib/Kconfig.ubsan
-index 63e5622010e0f..37b2839bd442f 100644
---- a/lib/Kconfig.ubsan
-+++ b/lib/Kconfig.ubsan
-@@ -118,7 +118,6 @@ config UBSAN_UNREACHABLE
- 
- config UBSAN_INTEGER_WRAP
-       bool "Perform checking for integer arithmetic wrap-around"
--      default UBSAN
-       depends on !COMPILE_TEST
-       depends on $(cc-option,-fsanitize=signed-integer-overflow)
-       depends on $(cc-option,-fsanitize=unsigned-integer-overflow)
--- 
-2.39.5
-

diff --git a/queue-6.14/series b/queue-6.14/series
index bd70ca62766503a2cd2ebd43f021b4e261717dbf..c96f8d1a18656772ec711eb7f4006e49e860c7b4 100644 (file)
--- a/queue-6.14/series
+++ b/queue-6.14/series
@@ -20,7 +20,6 @@ s390-pci-support-mmap-of-pci-resources-except-for-is.patch
 pci-msi-convert-pci_msi_ignore_mask-to-per-msi-domai.patch
 pci-msi-handle-the-nomask-flag-correctly-for-all-pci.patch
 pci-msi-add-an-option-to-write-msix-entry_data-befor.patch
-lib-kconfig.ubsan-remove-default-ubsan-from-ubsan_in.patch
 irqchip-renesas-rzv2h-simplify-rzv2h_icu_init.patch
 irqchip-renesas-rzv2h-add-struct-rzv2h_hw_info-with-.patch
 irqchip-renesas-rzv2h-prevent-tint-spurious-interrup.patch