drop kasan patch

diff --git a/queue-6.1/kasan-disable-software-tag-based-kasan-with-gcc.patch b/queue-6.1/kasan-disable-software-tag-based-kasan-with-gcc.patch
deleted file mode 100644 (file)
index 0de4011..0000000
--- a/queue-6.1/kasan-disable-software-tag-based-kasan-with-gcc.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 5f1f50fcbb793495ab320bdb4beb603bf965c2ce Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 14 Oct 2024 17:11:00 +0100
-Subject: kasan: Disable Software Tag-Based KASAN with GCC
-
-From: Will Deacon <will@kernel.org>
-
-[ Upstream commit 7aed6a2c51ffc97a126e0ea0c270fab7af97ae18 ]
-
-Syzbot reports a KASAN failure early during boot on arm64 when building
-with GCC 12.2.0 and using the Software Tag-Based KASAN mode:
-
-  | BUG: KASAN: invalid-access in smp_build_mpidr_hash arch/arm64/kernel/setup.c:133 [inline]
-  | BUG: KASAN: invalid-access in setup_arch+0x984/0xd60 arch/arm64/kernel/setup.c:356
-  | Write of size 4 at addr 03ff800086867e00 by task swapper/0
-  | Pointer tag: [03], memory tag: [fe]
-
-Initial triage indicates that the report is a false positive and a
-thorough investigation of the crash by Mark Rutland revealed the root
-cause to be a bug in GCC:
-
-  > When GCC is passed `-fsanitize=hwaddress` or
-  > `-fsanitize=kernel-hwaddress` it ignores
-  > `__attribute__((no_sanitize_address))`, and instruments functions
-  > we require are not instrumented.
-  >
-  > [...]
-  >
-  > All versions [of GCC] I tried were broken, from 11.3.0 to 14.2.0
-  > inclusive.
-  >
-  > I think we have to disable KASAN_SW_TAGS with GCC until this is
-  > fixed
-
-Disable Software Tag-Based KASAN when building with GCC by making
-CC_HAS_KASAN_SW_TAGS depend on !CC_IS_GCC.
-
-Cc: Andrey Konovalov <andreyknvl@gmail.com>
-Suggested-by: Mark Rutland <mark.rutland@arm.com>
-Reported-by: syzbot+908886656a02769af987@syzkaller.appspotmail.com
-Link: https://lore.kernel.org/r/000000000000f362e80620e27859@google.com
-Link: https://lore.kernel.org/r/ZvFGwKfoC4yVjN_X@J2N7QTR9R3
-Link: https://bugzilla.kernel.org/show_bug.cgi?id=218854
-Reviewed-by: Andrey Konovalov <andreyknvl@gmail.com>
-Acked-by: Mark Rutland <mark.rutland@arm.com>
-Link: https://lore.kernel.org/r/20241014161100.18034-1-will@kernel.org
-Signed-off-by: Will Deacon <will@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- lib/Kconfig.kasan | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/lib/Kconfig.kasan b/lib/Kconfig.kasan
-index ca09b1cf8ee9d..34420eb1cbfe1 100644
---- a/lib/Kconfig.kasan
-+++ b/lib/Kconfig.kasan
-@@ -22,8 +22,11 @@ config ARCH_DISABLE_KASAN_INLINE
- config CC_HAS_KASAN_GENERIC
-       def_bool $(cc-option, -fsanitize=kernel-address)
- 
-+# GCC appears to ignore no_sanitize_address when -fsanitize=kernel-hwaddress
-+# is passed. See https://bugzilla.kernel.org/show_bug.cgi?id=218854 (and
-+# the linked LKML thread) for more details.
- config CC_HAS_KASAN_SW_TAGS
--      def_bool $(cc-option, -fsanitize=kernel-hwaddress)
-+      def_bool !CC_IS_GCC && $(cc-option, -fsanitize=kernel-hwaddress)
- 
- # This option is only required for software KASAN modes.
- # Old GCC versions do not have proper support for no_sanitize_address.
-@@ -91,7 +94,7 @@ config KASAN_SW_TAGS
-       help
-         Enables Software Tag-Based KASAN.
- 
--        Requires GCC 11+ or Clang.
-+        Requires Clang.
- 
-         Supported only on arm64 CPUs and relies on Top Byte Ignore.
- 
--- 
-2.43.0
-

diff --git a/queue-6.1/series b/queue-6.1/series
index 1e6fdf797190e539e69213d56844b60afcb2ba74..6ecfc3269cacbd413f6847c4206505c34ba9137a 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -15,7 +15,6 @@ crypto-api-fix-liveliness-check-in-crypto_alg_tested.patch
 crypto-marvell-cesa-disable-hash-algorithms.patch
 sound-make-config_snd-depend-on-indirect_iomem-inste.patch
 drm-vmwgfx-limit-display-layout-ioctl-array-size-to-.patch
-kasan-disable-software-tag-based-kasan-with-gcc.patch
 nvme-multipath-defer-partition-scanning.patch
 powerpc-powernv-free-name-on-error-in-opal_event_ini.patch
 nvme-make-keep-alive-synchronous-operation.patch

diff --git a/queue-6.11/kasan-disable-software-tag-based-kasan-with-gcc.patch b/queue-6.11/kasan-disable-software-tag-based-kasan-with-gcc.patch
deleted file mode 100644 (file)
index 256b213..0000000
--- a/queue-6.11/kasan-disable-software-tag-based-kasan-with-gcc.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From f3c408bbb36563f810601873206f02d2ff0a1923 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 14 Oct 2024 17:11:00 +0100
-Subject: kasan: Disable Software Tag-Based KASAN with GCC
-
-From: Will Deacon <will@kernel.org>
-
-[ Upstream commit 7aed6a2c51ffc97a126e0ea0c270fab7af97ae18 ]
-
-Syzbot reports a KASAN failure early during boot on arm64 when building
-with GCC 12.2.0 and using the Software Tag-Based KASAN mode:
-
-  | BUG: KASAN: invalid-access in smp_build_mpidr_hash arch/arm64/kernel/setup.c:133 [inline]
-  | BUG: KASAN: invalid-access in setup_arch+0x984/0xd60 arch/arm64/kernel/setup.c:356
-  | Write of size 4 at addr 03ff800086867e00 by task swapper/0
-  | Pointer tag: [03], memory tag: [fe]
-
-Initial triage indicates that the report is a false positive and a
-thorough investigation of the crash by Mark Rutland revealed the root
-cause to be a bug in GCC:
-
-  > When GCC is passed `-fsanitize=hwaddress` or
-  > `-fsanitize=kernel-hwaddress` it ignores
-  > `__attribute__((no_sanitize_address))`, and instruments functions
-  > we require are not instrumented.
-  >
-  > [...]
-  >
-  > All versions [of GCC] I tried were broken, from 11.3.0 to 14.2.0
-  > inclusive.
-  >
-  > I think we have to disable KASAN_SW_TAGS with GCC until this is
-  > fixed
-
-Disable Software Tag-Based KASAN when building with GCC by making
-CC_HAS_KASAN_SW_TAGS depend on !CC_IS_GCC.
-
-Cc: Andrey Konovalov <andreyknvl@gmail.com>
-Suggested-by: Mark Rutland <mark.rutland@arm.com>
-Reported-by: syzbot+908886656a02769af987@syzkaller.appspotmail.com
-Link: https://lore.kernel.org/r/000000000000f362e80620e27859@google.com
-Link: https://lore.kernel.org/r/ZvFGwKfoC4yVjN_X@J2N7QTR9R3
-Link: https://bugzilla.kernel.org/show_bug.cgi?id=218854
-Reviewed-by: Andrey Konovalov <andreyknvl@gmail.com>
-Acked-by: Mark Rutland <mark.rutland@arm.com>
-Link: https://lore.kernel.org/r/20241014161100.18034-1-will@kernel.org
-Signed-off-by: Will Deacon <will@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- lib/Kconfig.kasan | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/lib/Kconfig.kasan b/lib/Kconfig.kasan
-index 98016e137b7f0..233ab20969242 100644
---- a/lib/Kconfig.kasan
-+++ b/lib/Kconfig.kasan
-@@ -22,8 +22,11 @@ config ARCH_DISABLE_KASAN_INLINE
- config CC_HAS_KASAN_GENERIC
-       def_bool $(cc-option, -fsanitize=kernel-address)
- 
-+# GCC appears to ignore no_sanitize_address when -fsanitize=kernel-hwaddress
-+# is passed. See https://bugzilla.kernel.org/show_bug.cgi?id=218854 (and
-+# the linked LKML thread) for more details.
- config CC_HAS_KASAN_SW_TAGS
--      def_bool $(cc-option, -fsanitize=kernel-hwaddress)
-+      def_bool !CC_IS_GCC && $(cc-option, -fsanitize=kernel-hwaddress)
- 
- # This option is only required for software KASAN modes.
- # Old GCC versions do not have proper support for no_sanitize_address.
-@@ -98,7 +101,7 @@ config KASAN_SW_TAGS
-       help
-         Enables Software Tag-Based KASAN.
- 
--        Requires GCC 11+ or Clang.
-+        Requires Clang.
- 
-         Supported only on arm64 CPUs and relies on Top Byte Ignore.
- 
--- 
-2.43.0
-

diff --git a/queue-6.11/series b/queue-6.11/series
index 589c5b3873b010ea26d32bb29ed4d2a7ba23e627..b1a1db2442e2084b19f98edf4756f1cd695466f7 100644 (file)
--- a/queue-6.11/series
+++ b/queue-6.11/series
@@ -22,7 +22,6 @@ drm-vmwgfx-limit-display-layout-ioctl-array-size-to-.patch
 selftests-bpf-assert-link-info-uprobe_multi-count-pa.patch
 rdma-siw-add-sendpage_ok-check-to-disable-msg_splice.patch
 alsa-hda-tas2781-add-new-quirk-for-lenovo-asus-dell-.patch
-kasan-disable-software-tag-based-kasan-with-gcc.patch
 nvme-multipath-defer-partition-scanning.patch
 drm-amdkfd-accounting-pdd-vram_usage-for-svm.patch
 powerpc-powernv-free-name-on-error-in-opal_event_ini.patch

diff --git a/queue-6.6/kasan-disable-software-tag-based-kasan-with-gcc.patch b/queue-6.6/kasan-disable-software-tag-based-kasan-with-gcc.patch
deleted file mode 100644 (file)
index 6b8bb50..0000000
--- a/queue-6.6/kasan-disable-software-tag-based-kasan-with-gcc.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 9c87afcf3ab71d9df0ff243ffe416a29a29f1bbd Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 14 Oct 2024 17:11:00 +0100
-Subject: kasan: Disable Software Tag-Based KASAN with GCC
-
-From: Will Deacon <will@kernel.org>
-
-[ Upstream commit 7aed6a2c51ffc97a126e0ea0c270fab7af97ae18 ]
-
-Syzbot reports a KASAN failure early during boot on arm64 when building
-with GCC 12.2.0 and using the Software Tag-Based KASAN mode:
-
-  | BUG: KASAN: invalid-access in smp_build_mpidr_hash arch/arm64/kernel/setup.c:133 [inline]
-  | BUG: KASAN: invalid-access in setup_arch+0x984/0xd60 arch/arm64/kernel/setup.c:356
-  | Write of size 4 at addr 03ff800086867e00 by task swapper/0
-  | Pointer tag: [03], memory tag: [fe]
-
-Initial triage indicates that the report is a false positive and a
-thorough investigation of the crash by Mark Rutland revealed the root
-cause to be a bug in GCC:
-
-  > When GCC is passed `-fsanitize=hwaddress` or
-  > `-fsanitize=kernel-hwaddress` it ignores
-  > `__attribute__((no_sanitize_address))`, and instruments functions
-  > we require are not instrumented.
-  >
-  > [...]
-  >
-  > All versions [of GCC] I tried were broken, from 11.3.0 to 14.2.0
-  > inclusive.
-  >
-  > I think we have to disable KASAN_SW_TAGS with GCC until this is
-  > fixed
-
-Disable Software Tag-Based KASAN when building with GCC by making
-CC_HAS_KASAN_SW_TAGS depend on !CC_IS_GCC.
-
-Cc: Andrey Konovalov <andreyknvl@gmail.com>
-Suggested-by: Mark Rutland <mark.rutland@arm.com>
-Reported-by: syzbot+908886656a02769af987@syzkaller.appspotmail.com
-Link: https://lore.kernel.org/r/000000000000f362e80620e27859@google.com
-Link: https://lore.kernel.org/r/ZvFGwKfoC4yVjN_X@J2N7QTR9R3
-Link: https://bugzilla.kernel.org/show_bug.cgi?id=218854
-Reviewed-by: Andrey Konovalov <andreyknvl@gmail.com>
-Acked-by: Mark Rutland <mark.rutland@arm.com>
-Link: https://lore.kernel.org/r/20241014161100.18034-1-will@kernel.org
-Signed-off-by: Will Deacon <will@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- lib/Kconfig.kasan | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/lib/Kconfig.kasan b/lib/Kconfig.kasan
-index fdca89c057452..275e6295fcd78 100644
---- a/lib/Kconfig.kasan
-+++ b/lib/Kconfig.kasan
-@@ -22,8 +22,11 @@ config ARCH_DISABLE_KASAN_INLINE
- config CC_HAS_KASAN_GENERIC
-       def_bool $(cc-option, -fsanitize=kernel-address)
- 
-+# GCC appears to ignore no_sanitize_address when -fsanitize=kernel-hwaddress
-+# is passed. See https://bugzilla.kernel.org/show_bug.cgi?id=218854 (and
-+# the linked LKML thread) for more details.
- config CC_HAS_KASAN_SW_TAGS
--      def_bool $(cc-option, -fsanitize=kernel-hwaddress)
-+      def_bool !CC_IS_GCC && $(cc-option, -fsanitize=kernel-hwaddress)
- 
- # This option is only required for software KASAN modes.
- # Old GCC versions do not have proper support for no_sanitize_address.
-@@ -100,7 +103,7 @@ config KASAN_SW_TAGS
-       help
-         Enables Software Tag-Based KASAN.
- 
--        Requires GCC 11+ or Clang.
-+        Requires Clang.
- 
-         Supported only on arm64 CPUs and relies on Top Byte Ignore.
- 
--- 
-2.43.0
-

diff --git a/queue-6.6/series b/queue-6.6/series
index ac17c6ce784196d7c2b89dd3af37b11ce13d2dc7..4e96b42d1fbd46c866610c04ad5105b7925e5bb8 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -14,7 +14,6 @@ crypto-marvell-cesa-disable-hash-algorithms.patch
 sound-make-config_snd-depend-on-indirect_iomem-inste.patch
 drm-vmwgfx-limit-display-layout-ioctl-array-size-to-.patch
 rdma-siw-add-sendpage_ok-check-to-disable-msg_splice.patch
-kasan-disable-software-tag-based-kasan-with-gcc.patch
 nvme-multipath-defer-partition-scanning.patch
 drm-amdkfd-accounting-pdd-vram_usage-for-svm.patch
 powerpc-powernv-free-name-on-error-in-opal_event_ini.patch