aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRich Ercolani <214141+rincebrain@users.noreply.github.com>2021-06-26 05:28:12 +0000
committerGitHub <noreply@github.com>2021-06-26 05:28:12 +0000
commit2084e9f7483a50f63ea8efbf3708fa82dcc85e86 (patch)
treeaef1720628a472da401efff71b3a7e419980bbc7
parent5e2c8338bf17d31b44eb1dbbb3c9b6a0f64e96ee (diff)
downloadsrc-2084e9f7483a50f63ea8efbf3708fa82dcc85e86.tar.gz
src-2084e9f7483a50f63ea8efbf3708fa82dcc85e86.zip
Fix build with KASAN
The stock zstd code expects some helpers from ASAN if present. This works fine in userland, but in kernel, KASAN also gets detected, and lacks those helpers. So let's make some empty substitutes for that case. Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Rich Ercolani <rincebrain@gmail.com> Closes #12232
-rw-r--r--module/zstd/zfs_zstd.c19
1 files changed, 19 insertions, 0 deletions
diff --git a/module/zstd/zfs_zstd.c b/module/zstd/zfs_zstd.c
index fc1b0359aa69..a91ed1be9efe 100644
--- a/module/zstd/zfs_zstd.c
+++ b/module/zstd/zfs_zstd.c
@@ -202,6 +202,25 @@ static struct zstd_fallback_mem zstd_dctx_fallback;
static struct zstd_pool *zstd_mempool_cctx;
static struct zstd_pool *zstd_mempool_dctx;
+/*
+ * The library zstd code expects these if ADDRESS_SANITIZER gets defined,
+ * and while ASAN does this, KASAN defines that and does not. So to avoid
+ * changing the external code, we do this.
+ */
+#if defined(__has_feature)
+#if __has_feature(address_sanitizer)
+#define ADDRESS_SANITIZER 1
+#endif
+#elif defined(__SANITIZE_ADDRESS__)
+#define ADDRESS_SANITIZER 1
+#endif
+#if defined(_KERNEL) && defined(ADDRESS_SANITIZER)
+void __asan_unpoison_memory_region(void const volatile *addr, size_t size);
+void __asan_poison_memory_region(void const volatile *addr, size_t size);
+void __asan_unpoison_memory_region(void const volatile *addr, size_t size) {};
+void __asan_poison_memory_region(void const volatile *addr, size_t size) {};
+#endif
+
static void
zstd_mempool_reap(struct zstd_pool *zstd_mempool)