summaryrefslogtreecommitdiff
path: root/lib/libc
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2019-03-05 01:35:52 +0000
committerchristos <christos@NetBSD.org>2019-03-05 01:35:52 +0000
commit03bbc0809832cfc64ebef984c1dae5d64c95bfca (patch)
tree11c70e20854dd6c80f39bb8826532c3af2e9134b /lib/libc
parent9dc824f400679beae5c68745c5200ca0478a7c3d (diff)
Transfer all the keys that were created in the libc stub implementation
to the pthread tsd implementation when the main thread is created. This corrects a problem where a process created keys before libpthread was loaded (either from the libc constructor or because libpthread was dlopened later). This fixes a problem with jemalloc which creates keys in the constructor.
Diffstat (limited to 'lib/libc')
-rw-r--r--lib/libc/include/tsd.h41
-rw-r--r--lib/libc/thread-stub/thread-stub.c13
2 files changed, 45 insertions, 9 deletions
diff --git a/lib/libc/include/tsd.h b/lib/libc/include/tsd.h
new file mode 100644
index 00000000000..a2d7e02f426
--- /dev/null
+++ b/lib/libc/include/tsd.h
@@ -0,0 +1,41 @@
+/* $NetBSD: tsd.h,v 1.1 2019/03/05 01:35:52 christos Exp $ */
+
+/*-
+ * Copyright (c) 2019 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef _TSD_H_
+#define _TSD_H_
+
+#define TSD_KEYS_MAX 64
+
+struct __libc_tsd {
+ void *tsd_val;
+ void (*tsd_dtor)(void *);
+ int tsd_inuse;
+};
+
+extern struct __libc_tsd __libc_tsd[TSD_KEYS_MAX];
+
+#endif /* _TSD_H_ */
diff --git a/lib/libc/thread-stub/thread-stub.c b/lib/libc/thread-stub/thread-stub.c
index d50bd80324c..c89fafbedee 100644
--- a/lib/libc/thread-stub/thread-stub.c
+++ b/lib/libc/thread-stub/thread-stub.c
@@ -1,4 +1,4 @@
-/* $NetBSD: thread-stub.c,v 1.28 2016/10/31 18:10:11 kamil Exp $ */
+/* $NetBSD: thread-stub.c,v 1.29 2019/03/05 01:35:52 christos Exp $ */
/*-
* Copyright (c) 2003, 2009 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: thread-stub.c,v 1.28 2016/10/31 18:10:11 kamil Exp $");
+__RCSID("$NetBSD: thread-stub.c,v 1.29 2019/03/05 01:35:52 christos Exp $");
#endif /* LIBC_SCCS and not lint */
/*
@@ -47,6 +47,7 @@ __RCSID("$NetBSD: thread-stub.c,v 1.28 2016/10/31 18:10:11 kamil Exp $");
#define pthread_detach __libc_pthread_detach
#include "namespace.h"
#include "reentrant.h"
+#include "tsd.h"
#include <errno.h>
#include <signal.h>
@@ -280,13 +281,7 @@ __libc_rwlock_catchall_stub(rwlock_t *l)
* implementation, since some thread-safe libraries want to use it.
*/
-#define TSD_KEYS_MAX 64
-
-static struct {
- void *tsd_val;
- void (*tsd_dtor)(void *);
- int tsd_inuse;
-} __libc_tsd[TSD_KEYS_MAX];
+struct __libc_tsd __libc_tsd[TSD_KEYS_MAX];
static int __libc_tsd_nextkey;
__weak_alias(__libc_thr_keycreate,__libc_thr_keycreate_stub)