summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2016-02-28 02:56:39 +0000
committerchristos <christos@NetBSD.org>2016-02-28 02:56:39 +0000
commit9f2cfb86a42a8768ebb817588bdb91ea60ccd58f (patch)
tree37aae457c8168df477c672e5a4a00945d8bad63e /common
parentdc909c5a95a153537380ceb3366368432e325d53 (diff)
fix infinite recursion through thr_getspecific
Diffstat (limited to 'common')
-rw-r--r--common/lib/libc/gmon/mcount.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/common/lib/libc/gmon/mcount.c b/common/lib/libc/gmon/mcount.c
index 6ea3d3c87c0..5591a21bb8f 100644
--- a/common/lib/libc/gmon/mcount.c
+++ b/common/lib/libc/gmon/mcount.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mcount.c,v 1.12 2016/01/11 01:57:12 christos Exp $ */
+/* $NetBSD: mcount.c,v 1.13 2016/02/28 02:56:39 christos Exp $ */
/*
* Copyright (c) 2003, 2004 Wasabi Systems, Inc.
@@ -76,7 +76,7 @@
#if 0
static char sccsid[] = "@(#)mcount.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: mcount.c,v 1.12 2016/01/11 01:57:12 christos Exp $");
+__RCSID("$NetBSD: mcount.c,v 1.13 2016/02/28 02:56:39 christos Exp $");
#endif
#endif
@@ -145,12 +145,17 @@ _MCOUNT_DECL(u_long frompc, u_long selfpc)
#if defined(_REENTRANT) && !defined(_KERNEL)
if (__isthreaded) {
+ /* prevent re-entry via thr_getspecific */
+ if (_gmonparam.state != GMON_PROF_ON)
+ return;
+ _gmonparam.state = GMON_PROF_BUSY;
p = thr_getspecific(_gmonkey);
if (p == NULL) {
/* Prevent recursive calls while allocating */
thr_setspecific(_gmonkey, &_gmondummy);
p = _m_gmon_alloc();
}
+ _gmonparam.state = GMON_PROF_ON;
} else
#endif
p = &_gmonparam;