Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 1 | From efb0fca7db742f4195e1771d8ba4c7fba4938819 Mon Sep 17 00:00:00 2001 |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Sat, 27 Jan 2018 10:05:07 -0800 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 4 | Subject: [PATCH] reset dl_load_write_lock after forking |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 5 | |
| 6 | The patch in this Bugzilla entry was requested by a customer: |
| 7 | |
| 8 | https://www.sourceware.org/bugzilla/show_bug.cgi?id=19282 |
| 9 | |
| 10 | The __libc_fork() code reset dl_load_lock, but it also needed to reset |
| 11 | dl_load_write_lock. The patch has not yet been integrated upstream. |
| 12 | |
| 13 | Upstream-Status: Pending [ No Author See bugzilla] |
| 14 | |
| 15 | Signed-off-by: Damodar Sonone <damodar.sonone@kpit.com> |
| 16 | Signed-off-by: Yuanjie Huang <yuanjie.huang@windriver.com> |
| 17 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 18 | --- |
| 19 | sysdeps/nptl/fork.c | 4 ++-- |
| 20 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 21 | |
| 22 | diff --git a/sysdeps/nptl/fork.c b/sysdeps/nptl/fork.c |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 23 | index ec56a827eb..0f48933ff1 100644 |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 24 | --- a/sysdeps/nptl/fork.c |
| 25 | +++ b/sysdeps/nptl/fork.c |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 26 | @@ -130,9 +130,9 @@ __libc_fork (void) |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 27 | _IO_list_resetlock (); |
| 28 | } |
| 29 | |
| 30 | - /* Reset the lock the dynamic loader uses to protect its data. */ |
| 31 | + /* Reset the locks the dynamic loader uses to protect its data. */ |
| 32 | __rtld_lock_initialize (GL(dl_load_lock)); |
| 33 | - |
| 34 | + __rtld_lock_initialize (GL(dl_load_write_lock)); |
| 35 | /* Run the handlers registered for the child. */ |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 36 | __run_fork_handlers (atfork_run_child); |
| 37 | } |