[perl/f17] Fix dead lock in PerlIO after fork from thread

[Petr Pisar]

commit 8b7729ef202f3bc52cd58643ce9f7ca402f8d8d9
Author: Petr Písař <ppisar at redhat.com>
Date:   Wed Apr 10 15:37:36 2013 +0200

    Fix dead lock in PerlIO after fork from thread

 ...106212-Add-PL_perlio_mutex-to-atfork_lock.patch |   48 ++++++++++++++++++++
 perl.spec                                          |    6 +++
 2 files changed, 54 insertions(+), 0 deletions(-)
---
diff --git a/perl-5.17.9-106212-Add-PL_perlio_mutex-to-atfork_lock.patch b/perl-5.17.9-106212-Add-PL_perlio_mutex-to-atfork_lock.patch
new file mode 100644
index 0000000..9e3fa34
--- /dev/null
+++ b/perl-5.17.9-106212-Add-PL_perlio_mutex-to-atfork_lock.patch
@@ -0,0 +1,48 @@
+From 4da80956418bbe1fdc23cad0b1cbb24cd7b87609 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Patrik=20H=C3=A4gglund?= <patrik.h.hagglund at ericsson.com>
+Date: Sat, 2 Feb 2013 20:21:05 +0100
+Subject: [PATCH] PATCH [perl #106212] Add PL_perlio_mutex to
+ atfork_lock/unlock
+
+Using threads + fork() on Linux, and IO operations in the threads, the
+PL_perlio_mutex may be left in a locked state at the call of fork(),
+potentially leading to deadlock in the child process at subsequent IO
+operations. (Threads are pre-empted and not continued in the child
+process after the fork.)
+
+Therefore, ensure that the PL_perlio_mutex is unlocked in the child
+process, right after fork(), by using atfork_lock/unlock.
+
+(The RT text gives ways to reproduce the problem, but are not easily
+added to Perl's test suite)
+---
+ util.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/util.c b/util.c
+index 5c695b8..75381f1 100644
+--- a/util.c
++++ b/util.c
+@@ -2798,6 +2798,9 @@ Perl_atfork_lock(void)
+    dVAR;
+ #if defined(USE_ITHREADS)
+     /* locks must be held in locking order (if any) */
++#  ifdef USE_PERLIO
++    MUTEX_LOCK(&PL_perlio_mutex);
++#  endif
+ #  ifdef MYMALLOC
+     MUTEX_LOCK(&PL_malloc_mutex);
+ #  endif
+@@ -2812,6 +2815,9 @@ Perl_atfork_unlock(void)
+     dVAR;
+ #if defined(USE_ITHREADS)
+     /* locks must be released in same order as in atfork_lock() */
++#  ifdef USE_PERLIO
++    MUTEX_UNLOCK(&PL_perlio_mutex);
++#  endif
+ #  ifdef MYMALLOC
+     MUTEX_UNLOCK(&PL_malloc_mutex);
+ #  endif
+-- 
+1.8.1.4
+
diff --git a/perl.spec b/perl.spec
index 05c5859..91b95b5 100644
--- a/perl.spec
+++ b/perl.spec
@@ -125,6 +125,9 @@ Patch23:        perl-5.14.3-RT-82655-fix-double-free-when-loading-object.patch
 # Add NAME heading into CPAN PODs, rhbz#908113, CPANRT#73396
 Patch24:        perl-5.16.2-cpan-CPAN-add-NAME-headings-in-modules-with-POD.patch
 
+# Fix dead lock in PerlIO after fork from thread, rhbz#947444, RT#106212
+Patch25:        perl-5.17.9-106212-Add-PL_perlio_mutex-to-atfork_lock.patch
+
 # Update some of the bundled modules
 # see http://fedoraproject.org/wiki/Perl/perl.spec for instructions
 
@@ -1306,6 +1309,7 @@ tarball from perl.org.
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1
+%patch25 -p1
 
 #copy the example script
 cp -a %{SOURCE5} .
@@ -1519,6 +1523,7 @@ pushd %{build_archlib}/CORE/
     'Fedora Patch22: Fix misparsing of maketext strings (CVE-2012-6329)' \
     'Fedora Patch23: Fix double-free when loading Digest::SHA object' \
     'Fedora Patch24: Add NAME headings to CPAN modules (CPANRT#73396)' \
+    'Fedora Patch25: Fix dead lock in PerlIO after fork from thread (RT106212)' \
     %{nil}
 
 rm patchlevel.bak
@@ -2476,6 +2481,7 @@ sed \
 - Correct dependencies of perl-HTTP-Tiny
 - Correct perl-Digest-MD5 dependencies
 - Filter provides from *.pl files (bug #924938)
+- Fix dead lock in PerlIO after fork from thread (bug #947444)
 
 * Thu Mar 07 2013 Jitka Plesnikova <jplesnik at redhat.com> - 4:5.14.4-224
 - 5.14.4 bump (see