summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/glibc/glibc/0027-Acquire-ld.so-lock-before-switching-to-malloc_atfork.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-core/glibc/glibc/0027-Acquire-ld.so-lock-before-switching-to-malloc_atfork.patch')
-rw-r--r--meta/recipes-core/glibc/glibc/0027-Acquire-ld.so-lock-before-switching-to-malloc_atfork.patch68
1 files changed, 0 insertions, 68 deletions
diff --git a/meta/recipes-core/glibc/glibc/0027-Acquire-ld.so-lock-before-switching-to-malloc_atfork.patch b/meta/recipes-core/glibc/glibc/0027-Acquire-ld.so-lock-before-switching-to-malloc_atfork.patch
deleted file mode 100644
index 5bc813a900..0000000000
--- a/meta/recipes-core/glibc/glibc/0027-Acquire-ld.so-lock-before-switching-to-malloc_atfork.patch
+++ /dev/null
@@ -1,68 +0,0 @@
1From eb43af9afba3c2b499be6e71b69687d4e7c6272a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 27 Jan 2018 10:08:04 -0800
4Subject: [PATCH 27/30] Acquire ld.so lock before switching to malloc_atfork
5
6The patch is from
7 https://sourceware.org/bugzilla/show_bug.cgi?id=4578
8
9If a thread happens to hold dl_load_lock and have r_state set to RT_ADD or
10RT_DELETE at the time another thread calls fork(), then the child exit code
11from fork (in nptl/sysdeps/unix/sysv/linux/fork.c in our case) re-initializes
12dl_load_lock but does not restore r_state to RT_CONSISTENT. If the child
13subsequently requires ld.so functionality before calling exec(), then the
14assertion will fire.
15
16The patch acquires dl_load_lock on entry to fork() and releases it on exit
17from the parent path. The child path is initialized as currently done.
18This is essentially pthreads_atfork, but forced to be first because the
19acquisition of dl_load_lock must happen before malloc_atfork is active
20to avoid a deadlock.
21
22The patch has not yet been integrated upstream.
23
24Upstream-Status: Pending [ Not Author See bugzilla]
25
26Signed-off-by: Raghunath Lolur <Raghunath.Lolur@kpit.com>
27Signed-off-by: Yuanjie Huang <yuanjie.huang@windriver.com>
28Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com>
29Signed-off-by: Khem Raj <raj.khem@gmail.com>
30---
31 sysdeps/nptl/fork.c | 7 +++++++
32 1 file changed, 7 insertions(+)
33
34diff --git a/sysdeps/nptl/fork.c b/sysdeps/nptl/fork.c
35index 5c9bb44372..84a1a404b3 100644
36--- a/sysdeps/nptl/fork.c
37+++ b/sysdeps/nptl/fork.c
38@@ -25,6 +25,7 @@
39 #include <tls.h>
40 #include <hp-timing.h>
41 #include <ldsodefs.h>
42+#include <libc-lock.h>
43 #include <stdio-lock.h>
44 #include <atomic.h>
45 #include <nptl/pthreadP.h>
46@@ -56,6 +57,9 @@ __libc_fork (void)
47 bool multiple_threads = THREAD_GETMEM (THREAD_SELF, header.multiple_threads);
48
49 __run_fork_handlers (atfork_run_prepare);
50+ /* grab ld.so lock BEFORE switching to malloc_atfork */
51+ __rtld_lock_lock_recursive (GL(dl_load_lock));
52+ __rtld_lock_lock_recursive (GL(dl_load_write_lock));
53
54 /* If we are not running multiple threads, we do not have to
55 preserve lock state. If fork runs from a signal handler, only
56@@ -150,6 +154,9 @@ __libc_fork (void)
57
58 /* Run the handlers registered for the parent. */
59 __run_fork_handlers (atfork_run_parent);
60+ /* unlock ld.so last, because we locked it first */
61+ __rtld_lock_unlock_recursive (GL(dl_load_write_lock));
62+ __rtld_lock_unlock_recursive (GL(dl_load_lock));
63 }
64
65 return pid;
66--
672.20.1
68