libmemif: fix insecure uses of strncpy

[vpp.git] / src / svm / svm_common.h

diff --git a/src/svm/svm_common.h b/src/svm/svm_common.h
index e523da5..1f1132a 100644 (file)
--- a/src/svm/svm_common.h
+++ b/src/svm/svm_common.h
@@ -20,6 +20,7 @@
 
 #include <stdarg.h>
 #include <pthread.h>
+#include <sys/user.h>
 #include <vppinfra/types.h>
 
 #define SVM_VERSION ((1<<16) | 1)      /* set to declare region ready. */
@@ -66,7 +67,7 @@ typedef struct svm_map_region_args_
 {
   const char *root_path;       /* NULL means use the truly global arena */
   const char *name;
-  u64 baseva;
+  uword baseva;
   u64 size;
   u64 pvt_heap_size;
   uword flags;
@@ -77,6 +78,20 @@ typedef struct svm_map_region_args_
   int gid;
 } svm_map_region_args_t;
 
+/*
+ * Memory mapped to high addresses for session/vppcom/vcl/etc...
+ */
+#if __WORDSIZE == 64
+#ifdef CLIB_SANITIZE_ADDR
+#define HIGH_SEGMENT_BASEVA 0x300000000000     /* DO NOT CHANGE THIS: YOU'LL BREAK ASAN */
+#else /* CLIB_SANITIZE_ADDR */
+#define HIGH_SEGMENT_BASEVA (128ULL << 30)     /* 128GB */
+#endif /* CLIB_SANITIZE_ADDR */
+#elif __WORDSIZE == 32
+#define HIGH_SEGMENT_BASEVA (3584UL << 20)     /* 3.5GB */
+#else
+#error "unknown __WORDSIZE"
+#endif
 
 /*
  * Memory shared across all router instances. Packet buffers, etc