MSAN support

Author: arnaud-lb

Zend/zend_execute.h

@@ -27,7 +27,7 @@
 #include "zend_types.h"
 #include "zend_variables.h"
 #include "zend_constants.h"
-#include "zend_asan.h"
+#include "zend_sanitizers.h"
 
 #include <stdint.h>
 

Zend/zend_fibers.c

@@ -30,7 +30,7 @@
 #include "zend_compile.h"
 #include "zend_closures.h"
 #include "zend_generators.h"
-#include "zend_asan.h"
+#include "zend_sanitizers.h"
 
 #include "zend_fibers.h"
 #include "zend_fibers_arginfo.h"

Zend/zend_asan.h Zend/zend_sanitizers.hZend/zend_asan.h renamed to Zend/zend_sanitizers.h

@@ -14,8 +14,8 @@
    +----------------------------------------------------------------------+
 */
 
-#ifndef ZEND_ASAN_H
-#define ZEND_ASAN_H
+#ifndef ZEND_SANITIZERS_H
+#define ZEND_SANITIZERS_H
 
 #include "zend_portability.h"
 
@@ -26,14 +26,27 @@
 # define ASAN_UNPOISON_MEMORY_REGION(_ptr, _size)
 #endif
 
+#if __has_feature(memory_sanitizer)
+# include <sanitizer/msan_interface.h>
+# define MSAN_POISON_MEMORY_REGION(_ptr, _size)   __msan_allocated_memory(_ptr, _size)
+# define MSAN_UNPOISON_MEMORY_REGION(_ptr, _size) __msan_unpoison(_ptr, _size)
+#else
+# define MSAN_POISON_MEMORY_REGION(_ptr, _size)
+# define MSAN_UNPOISON_MEMORY_REGION(_ptr, _size)
+#endif
+
+/* Mark memory region as unaddressable (ASAN) and uninitialized (MSAN) */
 #define ZEND_POISON_MEMORY_REGION(_ptr, _size) do {     \
 	ZEND_ASSERT(!(((uintptr_t) (_ptr)) & 7));           \
 	ASAN_POISON_MEMORY_REGION((_ptr), (_size));         \
+	MSAN_POISON_MEMORY_REGION((_ptr), (_size));         \
 } while (0);
 
+/* Mark memory region as addressable (ASAN) without changing initialization state (MSAN) */
 #define ZEND_UNPOISON_MEMORY_REGION(_ptr, _size) do {   \
 	ZEND_ASSERT(!(((uintptr_t) (_ptr)) & 7));           \
 	ASAN_UNPOISON_MEMORY_REGION((_ptr), (_size));       \
+	/* No MSAN_UNPOISON_MEMORY_REGION */                \
 } while (0);
 
-#endif /* ZEND_ASAN_H */
+#endif /* ZEND_SANITIZERS_H */

ext/opcache/jit/zend_jit_helpers.c

@@ -17,7 +17,7 @@
 */
 
 #include "Zend/zend_API.h"
-#include "Zend/zend_asan.h"
+#include "Zend/zend_sanitizers.h"
 
 static ZEND_COLD void undef_result_after_exception(void) {
 	const zend_op *opline = EG(opline_before_exception);