git: 6de02228409f - main - dtrace: Add WITH_DTRACE_ASAN

The branch main has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=6de02228409fd2b7ca1d7e3b8d9043a105093cdd

commit 6de02228409fd2b7ca1d7e3b8d9043a105093cdd
Author:     Domagoj Stolfa <ds815@cam.ac.uk>
AuthorDate: 2023-08-02 00:10:46 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2023-08-02 13:15:08 +0000

    dtrace: Add WITH_DTRACE_ASAN
    
    See commit 4ae6991228105eb34989c870194ae7b0a1e23be4.  This version of
    the commit avoids inadvertently changing SHLIBDIR for libdtrace.so.
---
 cddl/lib/libdtrace/Makefile          | 10 ++++++++++
 cddl/usr.sbin/dtrace/Makefile        |  5 +++++
 cddl/usr.sbin/lockstat/Makefile      |  7 +++++++
 cddl/usr.sbin/plockstat/Makefile     |  7 +++++++
 share/man/man5/src.conf.5            |  5 +++++
 share/mk/src.opts.mk                 |  1 +
 tools/build/options/WITH_DTRACE_ASAN |  4 ++++
 7 files changed, 39 insertions(+)

diff --git a/cddl/lib/libdtrace/Makefile b/cddl/lib/libdtrace/Makefile
index 23cc8d2db574..da31618f581e 100644
--- a/cddl/lib/libdtrace/Makefile
+++ b/cddl/lib/libdtrace/Makefile
@@ -1,10 +1,15 @@
 # $FreeBSD$
 
+SHLIBDIR?=	/lib
+
+.include <src.opts.mk>
+
 .PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libdtrace/common
 .PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libgen/common
 
 PACKAGE=	dtrace
 LIB=		dtrace
+
 SRCS=		dt_aggregate.c \
 		dt_as.c \
 		dt_buf.c \
@@ -138,6 +143,11 @@ DSRCS+=		regs_aarch64.d
 
 YFLAGS+=-d
 
+.if ${MK_DTRACE_ASAN} != "no"
+CFLAGS+=	-fsanitize=address -fsanitize=undefined
+LDFLAGS+=	-fsanitize=address -fsanitize=undefined
+.endif
+
 LIBADD=	ctf elf proc pthread rtld_db
 
 CLEANFILES=	dt_errtags.c dt_names.c
diff --git a/cddl/usr.sbin/dtrace/Makefile b/cddl/usr.sbin/dtrace/Makefile
index d8510e62fb29..fcc0668f1b1d 100644
--- a/cddl/usr.sbin/dtrace/Makefile
+++ b/cddl/usr.sbin/dtrace/Makefile
@@ -30,6 +30,11 @@ CFLAGS+= -DHAVE_ISSETUGID
 #CFLAGS+=	-DNEED_ERRLOC
 #YFLAGS+=	-d
 
+.if ${MK_DTRACE_ASAN} != "no"
+CFLAGS+=	-fsanitize=address -fsanitize=undefined
+LDFLAGS+=	-fsanitize=address -fsanitize=undefined
+.endif
+
 LIBADD=	dtrace ctf elf proc spl
 
 .if ${MK_DTRACE_TESTS} != "no"
diff --git a/cddl/usr.sbin/lockstat/Makefile b/cddl/usr.sbin/lockstat/Makefile
index a4bec42df367..72cedbdb20ed 100644
--- a/cddl/usr.sbin/lockstat/Makefile
+++ b/cddl/usr.sbin/lockstat/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <src.opts.mk>
+
 .PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/lockstat
 
 PACKAGE=	dtrace
@@ -26,6 +28,11 @@ CFLAGS+=	-I${SRCTOP}/sys/cddl/compat/opensolaris \
 		-I${SRCTOP}/sys
 CFLAGS+= -DHAVE_ISSETUGID
 
+.if ${MK_DTRACE_ASAN} != "no"
+CFLAGS+=	-fsanitize=address -fsanitize=undefined
+LDFLAGS+=	-fsanitize=address -fsanitize=undefined
+.endif
+
 CFLAGS+=	-DNEED_ERRLOC -g
 
 #YFLAGS+=	-d
diff --git a/cddl/usr.sbin/plockstat/Makefile b/cddl/usr.sbin/plockstat/Makefile
index 22610870c846..41ef446c111b 100644
--- a/cddl/usr.sbin/plockstat/Makefile
+++ b/cddl/usr.sbin/plockstat/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <src.opts.mk>
+
 .PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/plockstat
 
 PACKAGE=	dtrace
@@ -26,6 +28,11 @@ CFLAGS+=	-I${SRCTOP}/sys/cddl/compat/opensolaris \
 		-I${SRCTOP}/sys
 CFLAGS+= -DHAVE_ISSETUGID
 
+.if ${MK_DTRACE_ASAN} != "no"
+CFLAGS+=	-fsanitize=address -fsanitize=undefined
+LDFLAGS+=	-fsanitize=address -fsanitize=undefined
+.endif
+
 LIBADD=	dtrace proc
 
 .include <bsd.prog.mk>
diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5
index 3eeb3440e986..15c80af095e6 100644
--- a/share/man/man5/src.conf.5
+++ b/share/man/man5/src.conf.5
@@ -594,6 +594,11 @@ When set, it enforces these options:
 .It
 .Va WITHOUT_CTF
 .El
+.It Va WITH_DTRACE_ASAN
+Compile userspace DTrace code (libdtrace, dtrace(1), lockstat(1), plockstat(1))
+with address and undefined behavior sanitizers.
+Requires that Clang be used as the base system compiler
+and that the runtime support library is available.
 .It Va WITH_DTRACE_TESTS
 Build and install the DTrace test suite in
 .Pa /usr/tests/cddl/usr.sbin/dtrace .
diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index bed2b718654d..155ce97e88c4 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -200,6 +200,7 @@ __DEFAULT_NO_OPTIONS = \
     CLANG_FORMAT \
     DETECT_TZ_CHANGES \
     DISK_IMAGE_TOOLS_BOOTSTRAP \
+    DTRACE_ASAN \
     DTRACE_TESTS \
     EXPERIMENTAL \
     HESIOD \
diff --git a/tools/build/options/WITH_DTRACE_ASAN b/tools/build/options/WITH_DTRACE_ASAN
new file mode 100644
index 000000000000..4240aee4b89b
--- /dev/null
+++ b/tools/build/options/WITH_DTRACE_ASAN
@@ -0,0 +1,4 @@
+Compile userspace DTrace code (libdtrace, dtrace(1), lockstat(1), plockstat(1))
+with address and undefined behavior sanitizers.
+Requires that Clang be used as the base system compiler
+and that the runtime support library is available.