diff options
| author | Rich Ercolani <[email protected]> | 2021-06-26 01:28:12 -0400 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2021-06-29 13:14:42 -0700 |
| commit | 57ce66d293de75e44b4d569a7256c7099a4bbdf8 (patch) | |
| tree | ab1eba6cff4b02f40238a93a738cef8ce7a08d62 /module | |
| parent | da6c288dfc9c275ff52c7764d8e0ae69c02afa87 (diff) | |
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 <[email protected]>
Signed-off-by: Rich Ercolani <[email protected]>
Closes #12232
Diffstat (limited to 'module')
| -rw-r--r-- | module/zstd/zfs_zstd.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/module/zstd/zfs_zstd.c b/module/zstd/zfs_zstd.c index fc1b0359a..a91ed1be9 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) |