mirror of
https://git.yoctoproject.org/poky
synced 2026-06-01 00:59:48 +00:00
glibc: Drop upstream rejected patches
These patches were applied, hoping that they will eventually be accepted upstream but they have been rejected, I think its best that they are dropped so we can avoid novel unintended behaviours that no other distros will be seeing (From OE-Core rev:54550aa42378ce4b215bccbfd95e5e650b0d2efa) (From OE-Core rev: dc2238b268d48b4e62a795a4f6b257efc298e2b2) Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com> Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
Richard Purdie
@@ -1,37 +0,0 @@
|
||||
From efb0fca7db742f4195e1771d8ba4c7fba4938819 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sat, 27 Jan 2018 10:05:07 -0800
|
||||
Subject: [PATCH] reset dl_load_write_lock after forking
|
||||
|
||||
The patch in this Bugzilla entry was requested by a customer:
|
||||
|
||||
https://www.sourceware.org/bugzilla/show_bug.cgi?id=19282
|
||||
|
||||
The __libc_fork() code reset dl_load_lock, but it also needed to reset
|
||||
dl_load_write_lock. The patch has not yet been integrated upstream.
|
||||
|
||||
Upstream-Status: Pending [ No Author See bugzilla]
|
||||
|
||||
Signed-off-by: Damodar Sonone <damodar.sonone@kpit.com>
|
||||
Signed-off-by: Yuanjie Huang <yuanjie.huang@windriver.com>
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
sysdeps/nptl/fork.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/sysdeps/nptl/fork.c b/sysdeps/nptl/fork.c
|
||||
index ec56a827eb..0f48933ff1 100644
|
||||
--- a/sysdeps/nptl/fork.c
|
||||
+++ b/sysdeps/nptl/fork.c
|
||||
@@ -130,9 +130,9 @@ __libc_fork (void)
|
||||
_IO_list_resetlock ();
|
||||
}
|
||||
|
||||
- /* Reset the lock the dynamic loader uses to protect its data. */
|
||||
+ /* Reset the locks the dynamic loader uses to protect its data. */
|
||||
__rtld_lock_initialize (GL(dl_load_lock));
|
||||
-
|
||||
+ __rtld_lock_initialize (GL(dl_load_write_lock));
|
||||
/* Run the handlers registered for the child. */
|
||||
__run_fork_handlers (atfork_run_child);
|
||||
}
|
||||
-65
@@ -1,65 +0,0 @@
|
||||
From 6ea962e0946da7564a774b08dd3eda28d64e9e56 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sat, 27 Jan 2018 10:08:04 -0800
|
||||
Subject: [PATCH] Acquire ld.so lock before switching to malloc_atfork
|
||||
|
||||
The patch is from
|
||||
https://sourceware.org/bugzilla/show_bug.cgi?id=4578
|
||||
|
||||
If a thread happens to hold dl_load_lock and have r_state set to RT_ADD or
|
||||
RT_DELETE at the time another thread calls fork(), then the child exit code
|
||||
from fork (in nptl/sysdeps/unix/sysv/linux/fork.c in our case) re-initializes
|
||||
dl_load_lock but does not restore r_state to RT_CONSISTENT. If the child
|
||||
subsequently requires ld.so functionality before calling exec(), then the
|
||||
assertion will fire.
|
||||
|
||||
The patch acquires dl_load_lock on entry to fork() and releases it on exit
|
||||
from the parent path. The child path is initialized as currently done.
|
||||
This is essentially pthreads_atfork, but forced to be first because the
|
||||
acquisition of dl_load_lock must happen before malloc_atfork is active
|
||||
to avoid a deadlock.
|
||||
|
||||
The patch has not yet been integrated upstream.
|
||||
|
||||
Upstream-Status: Pending [ Not Author See bugzilla]
|
||||
|
||||
Signed-off-by: Raghunath Lolur <Raghunath.Lolur@kpit.com>
|
||||
Signed-off-by: Yuanjie Huang <yuanjie.huang@windriver.com>
|
||||
Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com>
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
sysdeps/nptl/fork.c | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
diff --git a/sysdeps/nptl/fork.c b/sysdeps/nptl/fork.c
|
||||
index 0f48933ff1..eef3f9669b 100644
|
||||
--- a/sysdeps/nptl/fork.c
|
||||
+++ b/sysdeps/nptl/fork.c
|
||||
@@ -25,6 +25,7 @@
|
||||
#include <tls.h>
|
||||
#include <hp-timing.h>
|
||||
#include <ldsodefs.h>
|
||||
+#include <libc-lock.h>
|
||||
#include <stdio-lock.h>
|
||||
#include <atomic.h>
|
||||
#include <nptl/pthreadP.h>
|
||||
@@ -56,6 +57,9 @@ __libc_fork (void)
|
||||
bool multiple_threads = THREAD_GETMEM (THREAD_SELF, header.multiple_threads);
|
||||
|
||||
__run_fork_handlers (atfork_run_prepare);
|
||||
+ /* grab ld.so lock BEFORE switching to malloc_atfork */
|
||||
+ __rtld_lock_lock_recursive (GL(dl_load_lock));
|
||||
+ __rtld_lock_lock_recursive (GL(dl_load_write_lock));
|
||||
|
||||
/* If we are not running multiple threads, we do not have to
|
||||
preserve lock state. If fork runs from a signal handler, only
|
||||
@@ -150,6 +154,9 @@ __libc_fork (void)
|
||||
|
||||
/* Run the handlers registered for the parent. */
|
||||
__run_fork_handlers (atfork_run_parent);
|
||||
+ /* unlock ld.so last, because we locked it first */
|
||||
+ __rtld_lock_unlock_recursive (GL(dl_load_write_lock));
|
||||
+ __rtld_lock_unlock_recursive (GL(dl_load_lock));
|
||||
}
|
||||
|
||||
return pid;
|
||||
@@ -40,8 +40,6 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
|
||||
file://0023-Define-DUMMY_LOCALE_T-if-not-defined.patch \
|
||||
file://0024-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch \
|
||||
file://0025-locale-fix-hard-coded-reference-to-gcc-E.patch \
|
||||
file://0026-reset-dl_load_write_lock-after-forking.patch \
|
||||
file://0027-Acquire-ld.so-lock-before-switching-to-malloc_atfork.patch \
|
||||
file://0028-bits-siginfo-consts.h-enum-definition-for-TRAP_HWBKP.patch \
|
||||
file://0029-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch \
|
||||
file://0030-intl-Emit-no-lines-in-bison-generated-files.patch \
|
||||
|
||||
Reference in New Issue
Block a user