8ae002
commit 217a74a85cdd60df236c296ad88142b78d35eccf
8ae002
Author: Andreas Schwab <schwab@suse.de>
8ae002
Date:   Mon Dec 8 15:13:38 2014 +0100
8ae002
8ae002
    Don't touch user-controlled stdio locks in forked child (bug 12847)
8ae002
    
8ae002
    The stdio locks for streams with the _IO_USER_LOCK flag should not be
8ae002
    touched by internal code.
8ae002
8ae002
--- glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/fork.c
8ae002
+++ glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/fork.c
8ae002
@@ -45,7 +45,8 @@
8ae002
   _IO_ITER i;
8ae002
 
8ae002
   for (i = _IO_iter_begin(); i != _IO_iter_end(); i = _IO_iter_next(i))
8ae002
-    _IO_lock_init (*((_IO_lock_t *) _IO_iter_file(i)->_lock));
8ae002
+    if ((_IO_iter_file (i)->_flags & _IO_USER_LOCK) == 0)
8ae002
+      _IO_lock_init (*((_IO_lock_t *) _IO_iter_file(i)->_lock));
8ae002
 }
8ae002
 
8ae002