From 6531cf5d1cffab8690c42847eef4f00f3018bb70 Mon Sep 17 00:00:00 2001
From: Benoît Ganne <bganne@cisco.com>
Date: Fri, 30 Sep 2022 17:13:33 +0200
Subject: vppinfra: fix AddressSanitizer
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When checking for CLIB_SANITIZE_ADDR to enable specific behavior for
AddressSanitizer, we must have vppinfra/clib.h included as it is defined
there.

Type: fix

Change-Id: I9060c3c29c1289d28596c215a1d1709b2ea7c84e
Signed-off-by: Benoît Ganne <bganne@cisco.com>
---
 src/svm/svm_common.h         | 1 +
 src/vcl/ldp_socket_wrapper.c | 2 ++
 src/vlib/main.h              | 1 +
 src/vlib/node_funcs.h        | 1 +
 src/vlib/physmem.c           | 1 +
 src/vpp/vnet/main.c          | 1 +
 src/vppinfra/dlmalloc.c      | 1 +
 7 files changed, 8 insertions(+)

(limited to 'src')

diff --git a/src/svm/svm_common.h b/src/svm/svm_common.h
index 1f1132afdc2..c0581f2c29a 100644
--- a/src/svm/svm_common.h
+++ b/src/svm/svm_common.h
@@ -21,6 +21,7 @@
 #include <stdarg.h>
 #include <pthread.h>
 #include <sys/user.h>
+#include <vppinfra/clib.h>
 #include <vppinfra/types.h>
 
 #define SVM_VERSION ((1<<16) | 1)	/* set to declare region ready. */
diff --git a/src/vcl/ldp_socket_wrapper.c b/src/vcl/ldp_socket_wrapper.c
index 253847136ae..e4e0f44f7f0 100644
--- a/src/vcl/ldp_socket_wrapper.c
+++ b/src/vcl/ldp_socket_wrapper.c
@@ -63,6 +63,8 @@
 #include <unistd.h>
 #include <pthread.h>
 
+#include <vppinfra/clib.h>
+
 #include <vcl/ldp_socket_wrapper.h>
 
 
diff --git a/src/vlib/main.h b/src/vlib/main.h
index acb9924ac44..a9cfab4f841 100644
--- a/src/vlib/main.h
+++ b/src/vlib/main.h
@@ -40,6 +40,7 @@
 #ifndef included_vlib_main_h
 #define included_vlib_main_h
 
+#include <vppinfra/clib.h>
 #include <vppinfra/callback_data.h>
 #include <vppinfra/elog.h>
 #include <vppinfra/format.h>
diff --git a/src/vlib/node_funcs.h b/src/vlib/node_funcs.h
index 45a36fef1be..115127ffee0 100644
--- a/src/vlib/node_funcs.h
+++ b/src/vlib/node_funcs.h
@@ -45,6 +45,7 @@
 #ifndef included_vlib_node_funcs_h
 #define included_vlib_node_funcs_h
 
+#include <vppinfra/clib.h>
 #include <vppinfra/fifo.h>
 #include <vppinfra/tw_timer_1t_3w_1024sl_ov.h>
 #include <vppinfra/interrupt.h>
diff --git a/src/vlib/physmem.c b/src/vlib/physmem.c
index a36444fdc9f..76f8494b331 100644
--- a/src/vlib/physmem.c
+++ b/src/vlib/physmem.c
@@ -21,6 +21,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include <vppinfra/clib.h>
 #include <vppinfra/linux/sysfs.h>
 #include <vlib/vlib.h>
 #include <vlib/physmem.h>
diff --git a/src/vpp/vnet/main.c b/src/vpp/vnet/main.c
index f7e5382f893..9a4bed6a6ea 100644
--- a/src/vpp/vnet/main.c
+++ b/src/vpp/vnet/main.c
@@ -17,6 +17,7 @@
 #include <pthread.h>
 #include <sched.h>
 
+#include <vppinfra/clib.h>
 #include <vppinfra/cpu.h>
 #include <vlib/vlib.h>
 #include <vlib/unix/unix.h>
diff --git a/src/vppinfra/dlmalloc.c b/src/vppinfra/dlmalloc.c
index 143db33c4b4..cc5915a3852 100644
--- a/src/vppinfra/dlmalloc.c
+++ b/src/vppinfra/dlmalloc.c
@@ -5,6 +5,7 @@
   comments, complaints, performance data, etc to dl@cs.oswego.edu
 */
 
+#include <vppinfra/clib.h>
 #include <vppinfra/dlmalloc.h>
 
 /*------------------------------ internal #includes ---------------------- */
-- 
cgit 1.2.3-korg