Skip to contentSkip to conversation

kasan: Fix Software Tag-Based KASAN with GCC

PATCH Applied Marco Elver 4 participants 9 messages Oct 21, 2024 – Oct 23, 2024

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 kasan: Fix Software Tag-Based KASAN with GCC

Per [1], -fsanitize=kernel-hwaddress with GCC currently does not disable instrumentation in functions with __attribute__((no_sanitize_address)).

However, __attribute__((no_sanitize("hwaddress"))) does correctly disable instrumentation. Use it instead.

---
 include/linux/compiler-gcc.h | 4 ++++
 1 file changed, 4 insertions(+)
include/linux/compiler-gcc.h +4 -0
index f805adaa316e..cd6f9aae311f 100644
@@ -80,7 +80,11 @@
 #define __noscs __attribute__((__no_sanitize__("shadow-call-stack")))
 #endif
 
+#ifdef __SANITIZE_HWADDRESS__
+#define __no_sanitize_address __attribute__((__no_sanitize__("hwaddress")))
+#else
 #define __no_sanitize_address __attribute__((__no_sanitize_address__))
+#endif
 
 #if defined(__SANITIZE_THREAD__)
 #define __no_sanitize_thread __attribute__((__no_sanitize_thread__))
Signature · 1 line
2.47.0.rc1.288.g06298d1525-goog
#1 lore raw

PATCH 2/2 Revert "kasan: Disable Software Tag-Based KASAN with GCC"

This reverts commit 7aed6a2c51ffc97a126e0ea0c270fab7af97ae18.

Now that __no_sanitize_address attribute is fixed for KASAN_SW_TAGS with GCC, allow re-enabling KASAN_SW_TAGS with GCC.

Cc Andrey Konovalov <[email protected]>
Cc Andrew Pinski <[email protected]>
Cc Mark Rutland <[email protected]>
Cc Will Deacon <[email protected]>
---
 lib/Kconfig.kasan | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
lib/Kconfig.kasan +2 -5
index 233ab2096924..98016e137b7f 100644
@@ -22,11 +22,8 @@ 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_IS_GCC && $(cc-option, -fsanitize=kernel-hwaddress)
+	def_bool $(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.
@@ -101,7 +98,7 @@ config KASAN_SW_TAGS
 	help
 	  Enables Software Tag-Based KASAN.
 
-	  Requires Clang.
+	  Requires GCC 11+ or Clang.
 
 	  Supported only on arm64 CPUs and relies on Top Byte Ignore.
 
Signature · 1 line
2.47.0.rc1.288.g06298d1525-goog
reviewer Reviewed-by on v1 2/2
#2 lore raw

Re: [PATCH 2/2] Revert "kasan: Disable Software Tag-Based KASAN with GCC"

Quoted 42 lines · Marco Elver

This reverts commit 7aed6a2c51ffc97a126e0ea0c270fab7af97ae18.

Now that __no_sanitize_address attribute is fixed for KASAN_SW_TAGS with GCC, allow re-enabling KASAN_SW_TAGS with GCC.

Cc Andrey Konovalov <[email protected]>
Cc Andrew Pinski <[email protected]>
Cc Mark Rutland <[email protected]>
Cc Will Deacon <[email protected]>
---
 lib/Kconfig.kasan | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
lib/Kconfig.kasan +2 -6
index 233ab2096924..98016e137b7f 100644
@@ -22,11 +22,8 @@ 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_IS_GCC && $(cc-option, -fsanitize=kernel-hwaddress)
+       def_bool $(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.
@@ -101,7 +98,7 @@ config KASAN_SW_TAGS
        help
          Enables Software Tag-Based KASAN.
 
-         Requires Clang.
+         Requires GCC 11+ or Clang.
 
          Supported only on arm64 CPUs and relies on Top Byte Ignore.
 
--
Quoted 2 lines

2.47.0.rc1.288.g06298d1525-goog

reviewer Reviewed-by on v1 1/2
#3 lore raw
In reply to Marco Elver
Quoted 38 lines · Marco Elver

Per [1], -fsanitize=kernel-hwaddress with GCC currently does not disable instrumentation in functions with __attribute__((no_sanitize_address)).

However, __attribute__((no_sanitize("hwaddress"))) does correctly disable instrumentation. Use it instead.

---
 include/linux/compiler-gcc.h | 4 ++++
 1 file changed, 4 insertions(+)
include/linux/compiler-gcc.h +4 -1
index f805adaa316e..cd6f9aae311f 100644
@@ -80,7 +80,11 @@
 #define __noscs __attribute__((__no_sanitize__("shadow-call-stack")))
 #endif
 
+#ifdef __SANITIZE_HWADDRESS__
+#define __no_sanitize_address __attribute__((__no_sanitize__("hwaddress")))
+#else
 #define __no_sanitize_address __attribute__((__no_sanitize_address__))
+#endif
 
 #if defined(__SANITIZE_THREAD__)
 #define __no_sanitize_thread __attribute__((__no_sanitize_thread__))
--
Quoted 2 lines

2.47.0.rc1.288.g06298d1525-goog

Thank you!

#4 lore raw
In reply to Marco Elver
Quoted 25 lines · Marco Elver

Per [1], -fsanitize=kernel-hwaddress with GCC currently does not disable instrumentation in functions with __attribute__((no_sanitize_address)).

However, __attribute__((no_sanitize("hwaddress"))) does correctly disable instrumentation. Use it instead.

---
 include/linux/compiler-gcc.h | 4 ++++
 1 file changed, 4 insertions(+)
include/linux/compiler-gcc.h +0 -0
index f805adaa316e..cd6f9aae311f 100644

include/linux/compiler-gcc.h line 87

Quoted 8 lines
include/linux/compiler-gcc.h +4 -0
@@ -80,7 +80,11 @@
 #define __noscs __attribute__((__no_sanitize__("shadow-call-stack")))
 #endif
 
+#ifdef __SANITIZE_HWADDRESS__
+#define __no_sanitize_address __attribute__((__no_sanitize__("hwaddress")))
+#else
 #define __no_sanitize_address __attribute__((__no_sanitize_address__))
+#endif

Does this work correctly for all versions of GCC that support -fsanitize=kernel-hwaddress?

Will

#5 lore raw
Quoted 30 lines · Will Deacon
Quoted 28 lines · Marco Elver

Per [1], -fsanitize=kernel-hwaddress with GCC currently does not disable instrumentation in functions with __attribute__((no_sanitize_address)).

However, __attribute__((no_sanitize("hwaddress"))) does correctly disable instrumentation. Use it instead.

---
 include/linux/compiler-gcc.h | 4 ++++
 1 file changed, 4 insertions(+)
include/linux/compiler-gcc.h +0 -0
index f805adaa316e..cd6f9aae311f 100644
@@ -80,7 +80,11 @@
 #define __noscs __attribute__((__no_sanitize__("shadow-call-stack")))
 #endif
 
Quoted 8 lines

include/linux/compiler-gcc.h line 87

Quoted 5 lines
include/linux/compiler-gcc.h +4 -0
+#ifdef __SANITIZE_HWADDRESS__
+#define __no_sanitize_address __attribute__((__no_sanitize__("hwaddress")))
+#else
 #define __no_sanitize_address __attribute__((__no_sanitize_address__))
+#endif

Does this work correctly for all versions of GCC that support -fsanitize=kernel-hwaddress?

Yes, tested from GCC 11+, kernel-hwaddress was added in GCC 11. Also tested from clang 9.0+ and it works there too.

Thanks,
Andrew Pinski

Quoted 2 lines

Will

#6 lore raw
Quoted 41 lines · Andrew Pinski
Quoted 30 lines · Will Deacon
Quoted 28 lines · Marco Elver

Per [1], -fsanitize=kernel-hwaddress with GCC currently does not disable instrumentation in functions with __attribute__((no_sanitize_address)).

However, __attribute__((no_sanitize("hwaddress"))) does correctly disable instrumentation. Use it instead.

---
 include/linux/compiler-gcc.h | 4 ++++
 1 file changed, 4 insertions(+)
include/linux/compiler-gcc.h +0 -0
index f805adaa316e..cd6f9aae311f 100644
@@ -80,7 +80,11 @@
 #define __noscs __attribute__((__no_sanitize__("shadow-call-stack")))
 #endif
 
Quoted 8 lines

include/linux/compiler-gcc.h line 87

Quoted 5 lines
include/linux/compiler-gcc.h +4 -0
+#ifdef __SANITIZE_HWADDRESS__
+#define __no_sanitize_address __attribute__((__no_sanitize__("hwaddress")))
+#else
 #define __no_sanitize_address __attribute__((__no_sanitize_address__))
+#endif

Does this work correctly for all versions of GCC that support -fsanitize=kernel-hwaddress?

Quoted 2 lines

Yes, tested from GCC 11+, kernel-hwaddress was added in GCC 11. Also tested from clang 9.0+ and it works there too.

+1 yes. From what I can tell GCC always supported no_sanitize("hwaddress") for -fsanitize=kernel-hwaddress.

Even for Clang, we define __no_sanitize_address to include no_sanitize("hwaddress"):
https://elixir.bootlin.com/linux/v6.11.4/source/include/linux/compiler-clang.h#L29

So this has just been an oversight when GCC support for KASAN_SW_TAGS was introduced.

Having a Fixes tag for this would be nice, but I don't think we explicitly added GCC support, and instead just relied on CC_HAS_KASAN_SW_TAGS with cc-option telling us if the flag is supported.

But maybe we can use this:

Fixes 7b861a53e46b ("kasan: Bump required compiler version")

Because it's the first time we encountered issues with no_sanitize, and bumped the required GCC version as a result. Perhaps going along with that should have been fixing of compiler-gcc.h's definition of __no_sanitize_address.

#7 lore raw
Quoted 42 lines · Marco Elver
Quoted 41 lines · Andrew Pinski
Quoted 38 lines · Will Deacon
Quoted 25 lines · Marco Elver

Per [1], -fsanitize=kernel-hwaddress with GCC currently does not disable instrumentation in functions with __attribute__((no_sanitize_address)).

However, __attribute__((no_sanitize("hwaddress"))) does correctly disable instrumentation. Use it instead.

---
 include/linux/compiler-gcc.h | 4 ++++
 1 file changed, 4 insertions(+)
include/linux/compiler-gcc.h +0 -0
index f805adaa316e..cd6f9aae311f 100644

include/linux/compiler-gcc.h line 87

Quoted 8 lines
include/linux/compiler-gcc.h +4 -0
@@ -80,7 +80,11 @@
 #define __noscs __attribute__((__no_sanitize__("shadow-call-stack")))
 #endif
 
+#ifdef __SANITIZE_HWADDRESS__
+#define __no_sanitize_address __attribute__((__no_sanitize__("hwaddress")))
+#else
 #define __no_sanitize_address __attribute__((__no_sanitize_address__))
+#endif

Does this work correctly for all versions of GCC that support -fsanitize=kernel-hwaddress?

Quoted 5 lines
Quoted 2 lines

Yes, tested from GCC 11+, kernel-hwaddress was added in GCC 11. Also tested from clang 9.0+ and it works there too.

+1 yes. From what I can tell GCC always supported no_sanitize("hwaddress") for -fsanitize=kernel-hwaddress.

Thanks, both, for confirming this. I'll pick these up as fixes in the arm64 tree.

Quoted 7 lines

Even for Clang, we define __no_sanitize_address to include no_sanitize("hwaddress"):
https://elixir.bootlin.com/linux/v6.11.4/source/include/linux/compiler-clang.h#L29

So this has just been an oversight when GCC support for KASAN_SW_TAGS was introduced.

Quoted 8 lines

Having a Fixes tag for this would be nice, but I don't think we explicitly added GCC support, and instead just relied on CC_HAS_KASAN_SW_TAGS with cc-option telling us if the flag is supported.

But maybe we can use this:

Fixes 7b861a53e46b ("kasan: Bump required compiler version")

I can add that to patch 1.

Will

Applied
#8 lore raw
In reply to Marco Elver
Quoted 8 lines · Marco Elver

Per [1], -fsanitize=kernel-hwaddress with GCC currently does not disable instrumentation in functions with __attribute__((no_sanitize_address)).

However, __attribute__((no_sanitize("hwaddress"))) does correctly disable instrumentation. Use it instead.

[...]

Applied to arm64 (for-next/fixes), thanks!

[1/2] kasan: Fix Software Tag-Based KASAN with GCC

      https://git.kernel.org/arm64/c/894b00a3350c
[2/2] Revert "kasan: Disable Software Tag-Based KASAN with GCC"
      https://git.kernel.org/arm64/c/237ab03e301d

Cheers,

Signature · 5 lines
Will

https://fixes.arm64.dev
https://next.arm64.dev
https://will.arm64.dev