Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 23 Jul 2021 14:49:58 GMT
From:      Mark Johnston <markj@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: f95e683fa231 - main - Annotate amd64 stack unwinders with __nomemorysanitize
Message-ID:  <202107231449.16NEnwfN015431@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by markj:

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

commit f95e683fa231fd1bed5cc10f52db0629a687ac3d
Author:     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2021-07-23 14:30:21 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2021-07-23 14:47:13 +0000

    Annotate amd64 stack unwinders with __nomemorysanitize
    
    Sponsored by:   The FreeBSD Foundation
---
 sys/amd64/amd64/db_trace.c  | 2 +-
 sys/dev/hwpmc/hwpmc_x86.c   | 2 +-
 sys/x86/x86/stack_machdep.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys/amd64/amd64/db_trace.c b/sys/amd64/amd64/db_trace.c
index 4c569c456e92..d2682afec8b0 100644
--- a/sys/amd64/amd64/db_trace.c
+++ b/sys/amd64/amd64/db_trace.c
@@ -258,7 +258,7 @@ db_nextframe(struct amd64_frame **fp, db_addr_t *ip, struct thread *td)
 	*fp = (struct amd64_frame *) rbp;
 }
 
-static int
+static int __nosanitizeaddress __nosanitizememory
 db_backtrace(struct thread *td, struct trapframe *tf, struct amd64_frame *frame,
     db_addr_t pc, register_t sp, int count)
 {
diff --git a/sys/dev/hwpmc/hwpmc_x86.c b/sys/dev/hwpmc/hwpmc_x86.c
index db6ed6fb1145..426f820b8a96 100644
--- a/sys/dev/hwpmc/hwpmc_x86.c
+++ b/sys/dev/hwpmc/hwpmc_x86.c
@@ -156,7 +156,7 @@ pmc_save_user_callchain(uintptr_t *cc, int nframes, struct trapframe *tf)
  * code, and if so we terminate our trace.
  */
 
-int __nosanitizeaddress
+int __nosanitizeaddress __nosanitizememory
 pmc_save_kernel_callchain(uintptr_t *cc, int nframes, struct trapframe *tf)
 {
 	int n;
diff --git a/sys/x86/x86/stack_machdep.c b/sys/x86/x86/stack_machdep.c
index 0e4bf1bf2930..1243137d2ea0 100644
--- a/sys/x86/x86/stack_machdep.c
+++ b/sys/x86/x86/stack_machdep.c
@@ -70,7 +70,7 @@ static struct mtx intr_lock;
 MTX_SYSINIT(intr_lock, &intr_lock, "stack intr", MTX_DEF);
 #endif
 
-static void __nosanitizeaddress
+static void __nosanitizeaddress __nosanitizememory
 stack_capture(struct thread *td, struct stack *st, register_t fp)
 {
 	x86_frame_t frame;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202107231449.16NEnwfN015431>