diff options
Diffstat (limited to 'meta/recipes-core/glibc/glibc/0028-Bug-4578-add-ld.so-lock-while-fork.patch')
-rw-r--r-- | meta/recipes-core/glibc/glibc/0028-Bug-4578-add-ld.so-lock-while-fork.patch | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/meta/recipes-core/glibc/glibc/0028-Bug-4578-add-ld.so-lock-while-fork.patch b/meta/recipes-core/glibc/glibc/0028-Bug-4578-add-ld.so-lock-while-fork.patch new file mode 100644 index 0000000000..f76237a46e --- /dev/null +++ b/meta/recipes-core/glibc/glibc/0028-Bug-4578-add-ld.so-lock-while-fork.patch | |||
@@ -0,0 +1,57 @@ | |||
1 | The patch in this Bugzilla entry was requested by a customer: | ||
2 | https://sourceware.org/bugzilla/show_bug.cgi?id=4578 | ||
3 | |||
4 | If a thread happens to hold dl_load_lock and have r_state set to RT_ADD or | ||
5 | RT_DELETE at the time another thread calls fork(), then the child exit code | ||
6 | from fork (in nptl/sysdeps/unix/sysv/linux/fork.c in our case) re-initializes | ||
7 | dl_load_lock but does not restore r_state to RT_CONSISTENT. If the child | ||
8 | subsequently requires ld.so functionality before calling exec(), then the | ||
9 | assertion will fire. | ||
10 | |||
11 | The patch acquires dl_load_lock on entry to fork() and releases it on exit | ||
12 | from the parent path. The child path is initialized as currently done. | ||
13 | This is essentially pthreads_atfork, but forced to be first because the | ||
14 | acquisition of dl_load_lock must happen before malloc_atfork is active | ||
15 | to avoid a deadlock. | ||
16 | The patch has not yet been integrated upstream. | ||
17 | |||
18 | Upstream-Status: Pending [ Not Author See bugzilla] | ||
19 | |||
20 | Signed-off-by: Raghunath Lolur <Raghunath.Lolur@kpit.com> | ||
21 | Signed-off-by: Yuanjie Huang <yuanjie.huang@windriver.com> | ||
22 | Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com> | ||
23 | |||
24 | Index: git/sysdeps/nptl/fork.c | ||
25 | =================================================================== | ||
26 | --- git.orig/sysdeps/nptl/fork.c 2017-08-03 16:02:15.674704080 +0800 | ||
27 | +++ git/sysdeps/nptl/fork.c 2017-08-04 18:15:02.463362015 +0800 | ||
28 | @@ -25,6 +25,7 @@ | ||
29 | #include <tls.h> | ||
30 | #include <hp-timing.h> | ||
31 | #include <ldsodefs.h> | ||
32 | +#include <libc-lock.h> | ||
33 | #include <stdio-lock.h> | ||
34 | #include <atomic.h> | ||
35 | #include <nptl/pthreadP.h> | ||
36 | @@ -60,6 +61,10 @@ | ||
37 | but our current fork implementation is not. */ | ||
38 | bool multiple_threads = THREAD_GETMEM (THREAD_SELF, header.multiple_threads); | ||
39 | |||
40 | + /* grab ld.so lock BEFORE switching to malloc_atfork */ | ||
41 | + __rtld_lock_lock_recursive (GL(dl_load_lock)); | ||
42 | + __rtld_lock_lock_recursive (GL(dl_load_write_lock)); | ||
43 | + | ||
44 | /* Run all the registered preparation handlers. In reverse order. | ||
45 | While doing this we build up a list of all the entries. */ | ||
46 | struct fork_handler *runp; | ||
47 | @@ -247,6 +252,10 @@ | ||
48 | |||
49 | allp = allp->next; | ||
50 | } | ||
51 | + | ||
52 | + /* unlock ld.so last, because we locked it first */ | ||
53 | + __rtld_lock_unlock_recursive (GL(dl_load_write_lock)); | ||
54 | + __rtld_lock_unlock_recursive (GL(dl_load_lock)); | ||
55 | } | ||
56 | |||
57 | return pid; | ||