From 01a103bec1771a22ca244de0d31ba91937243dd6 Mon Sep 17 00:00:00 2001 From: Benoît Ganne Date: Thu, 9 Jul 2020 14:23:51 +0200 Subject: vlib: fix asan compilation with gcc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit clang tends to force alignment of all sections when compiling for address sanitizer, confusing VPP plugin infra. On the contrary, GCC does not support this attribute on sections. Selectively enable it depending upon the compiler. Type: fix Fixes: cea46522e79637f6ec37c03ec3fbeb87b160a378 Change-Id: I2dd6e52e70e6b4d89c101171cafc813e175ec472 Signed-off-by: Benoît Ganne --- src/vlib/unix/plugin.h | 2 +- src/vppinfra/sanitizer.h | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/vlib/unix/plugin.h b/src/vlib/unix/plugin.h index a52c57bef7b..c9a33ccd96a 100644 --- a/src/vlib/unix/plugin.h +++ b/src/vlib/unix/plugin.h @@ -122,7 +122,7 @@ u8 *vlib_get_vat_plugin_path (void); #define VLIB_PLUGIN_REGISTER() \ vlib_plugin_registration_t vlib_plugin_registration \ - CLIB_NOSANITIZE_ADDR \ + CLIB_NOSANITIZE_PLUGIN_REG_SECTION \ __attribute__((__section__(".vlib_plugin_registration"))) /* Call a plugin init function: used for init function dependencies. */ diff --git a/src/vppinfra/sanitizer.h b/src/vppinfra/sanitizer.h index d099d3a941f..db4daea978d 100644 --- a/src/vppinfra/sanitizer.h +++ b/src/vppinfra/sanitizer.h @@ -51,6 +51,18 @@ CLIB_MEM_POISON_LEN (void *src, size_t oldlen, size_t newlen) #endif /* CLIB_SANITIZE_ADDR */ +/* + * clang tends to force alignment of all sections when compiling for address + * sanitizer. This confuse VPP plugin infra, prevent clang to do that + * On the contrary, GCC does not support this kind of attribute on sections + * sigh. + */ +#ifdef __clang__ +#define CLIB_NOSANITIZE_PLUGIN_REG_SECTION CLIB_NOSANITIZE_ADDR +#else +#define CLIB_NOSANITIZE_PLUGIN_REG_SECTION +#endif + #endif /* _included_clib_sanitizer_h */ /* -- cgit 1.2.3-korg