From fe3d8086fb6f941c660c8aabcb2122e7560f3dac Mon Sep 17 00:00:00 2001 From: David Bright Date: Tue, 19 Nov 2019 14:46:28 +0000 Subject: [PATCH] Don't sanitize linker_set The assumptions of linker_set don't play nicely with AddressSanitizer. AddressSanitizer adds a 'redzone' of zeros around globals (including those in named sections), whereas linker_set assumes they are all packed consecutively like a pointer array. So: let's annotate linker_set so that AddressSanitizer ignores it. Submitted by: Matthew Bryan Reviewed by: kib, rang_acm.org Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D22239 --- sys/sys/cdefs.h | 7 +++++++ sys/sys/linker_set.h | 1 + 2 files changed, 8 insertions(+) diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h index a2625a1ed5b..d95740bebce 100644 --- a/sys/sys/cdefs.h +++ b/sys/sys/cdefs.h @@ -872,6 +872,13 @@ /* Function should not be analyzed. */ #define __no_lock_analysis __lock_annotate(no_thread_safety_analysis) +/* Function or variable should not be sanitized, ie. by AddressSanitizer */ +#if __has_attribute(no_sanitize) +#define __nosanitizeaddress __attribute__((no_sanitize("address"))) +#else +#define __nosanitizeaddress +#endif + /* Guard variables and structure members by lock. */ #define __guarded_by(x) __lock_annotate(guarded_by(x)) #define __pt_guarded_by(x) __lock_annotate(pt_guarded_by(x)) diff --git a/sys/sys/linker_set.h b/sys/sys/linker_set.h index 9f49b802887..783cf9d615e 100644 --- a/sys/sys/linker_set.h +++ b/sys/sys/linker_set.h @@ -61,6 +61,7 @@ __GLOBL(__CONCAT(__stop_set_,set)); \ static void const * qv \ __set_##set##_sym_##sym __section("set_" #set) \ + __nosanitizeaddress \ __used = &(sym) #define __MAKE_SET(set, sym) __MAKE_SET_QV(set, sym, __MAKE_SET_CONST) #else /* !__GNUCLIKE___SECTION */