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