blob: 0fc40be4a9da14349ff98e697674d6c92871b046 [file] [log] [blame]
Brad Bishop1a4b7ee2018-12-16 17:11:34 -08001From caeccb7bec45f65bc89efa8195b3853368328361 Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Mon, 17 Sep 2018 12:49:36 +0800
4Subject: [PATCH] syslog-ng: fix segment fault during service start on arm64
5
6service start failed since segment fault on arch arm64,
7syslog-ng have a submodule ivykis, from ivykis V0.42,
8it use pthread_atfork, but for arm64, this symbol is
9not included by libpthread, so cause segment fault.
10
11refer systemd, replace pthread_atfork with __register_atfork
12to fix this problem.
13
14I have create an issue, and this proposal to upstream.
15https://github.com/buytenh/ivykis/issues/15
16
17Upstream-Status: Pending
18
19Signed-off-by: Changqing Li <changqing.li@windriver.com>
20---
21 lib/ivykis/src/pthr.h | 24 ++++++++++++------------
22 1 file changed, 12 insertions(+), 12 deletions(-)
23
24diff --git a/lib/ivykis/src/pthr.h b/lib/ivykis/src/pthr.h
25index a41eaf3..72c5190 100644
26--- a/lib/ivykis/src/pthr.h
27+++ b/lib/ivykis/src/pthr.h
28@@ -24,6 +24,16 @@
29 #include <pthread.h>
30 #include <signal.h>
31
32+#ifdef __GLIBC__
33+/* We use glibc __register_atfork() + __dso_handle directly here, as they are not included in the glibc
34+ * headers. __register_atfork() is mostly equivalent to pthread_atfork(), but doesn't require us to link against
35+ * libpthread, as it is part of glibc anyway. */
36+extern int __register_atfork(void (*prepare) (void), void (*parent) (void), void (*child) (void), void * __dso_handle);
37+extern void* __dso_handle __attribute__ ((__weak__));
38+#else
39+#define __register_atfork(prepare,parent,child,dso) pthread_atfork(prepare,parent,child)
40+#endif
41+
42 #ifdef HAVE_PRAGMA_WEAK
43 #pragma weak pthread_create
44 #endif
45@@ -36,16 +46,7 @@ static inline int pthreads_available(void)
46
47 #ifdef HAVE_PRAGMA_WEAK
48
49-/*
50- * On Linux, pthread_atfork() is defined in libpthread_nonshared.a,
51- * a static library, and we want to avoid "#pragma weak" for that
52- * symbol because that causes it to be undefined even if you link
53- * libpthread_nonshared.a in explicitly.
54- */
55-#ifndef HAVE_LIBPTHREAD_NONSHARED
56-#pragma weak pthread_atfork
57-#endif
58-
59+#pragma weak __register_atfork
60 #pragma weak pthread_create
61 #pragma weak pthread_detach
62 #pragma weak pthread_getspecific
63@@ -73,8 +74,7 @@ static inline int
64 pthr_atfork(void (*prepare)(void), void (*parent)(void), void (*child)(void))
65 {
66 if (pthreads_available())
67- return pthread_atfork(prepare, parent, child);
68-
69+ return __register_atfork(prepare, parent, child, __dso_handle);
70 return ENOSYS;
71 }
72
73--
742.7.4
75