From fd6562d6ebbf8d712fa5782d08d698a7b5582631 Mon Sep 17 00:00:00 2001 From: christos Date: Wed, 11 Aug 2021 11:16:49 +0000 Subject: [PATCH] PR/56355: Brad Harder: dtrace triggers double-fault in supervisor mode --- external/cddl/osnet/dev/fbt/x86/fbt_isa.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/external/cddl/osnet/dev/fbt/x86/fbt_isa.c b/external/cddl/osnet/dev/fbt/x86/fbt_isa.c index 6d6451129df0..bc8ee3a81c26 100644 --- a/external/cddl/osnet/dev/fbt/x86/fbt_isa.c +++ b/external/cddl/osnet/dev/fbt/x86/fbt_isa.c @@ -1,4 +1,4 @@ -/* $NetBSD: fbt_isa.c,v 1.3 2020/05/02 11:37:17 maxv Exp $ */ +/* $NetBSD: fbt_isa.c,v 1.4 2021/08/11 11:16:49 christos Exp $ */ /* * CDDL HEADER START @@ -251,8 +251,9 @@ fbt_provide_module_cb(const char *name, int symindx, void *value, /* * Exclude some more symbols which can be called from probe context. */ - if (strcmp(name, "x86_curcpu") == 0 || - strcmp(name, "x86_curlwp") == 0) { + if (strncmp(name, "trap", 4) || + strncmp(name, "x86_curcpu", 10) == 0 || + strncmp(name, "x86_curlwp", 10) == 0) { return 0; } #endif