JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Avoid deadlock in flock(2)

Browse Source 
* fcntl.cc (fcntl64): Don't lock fd table when performing locking.
	* flock.cc (flock): Ditto.
	(lockf): Ditto.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen
2015-11-05 18:31:36 +01:00
parent eeef727026
commit 41299df081
4 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/cygwin/flock.cc
View File

@@ -1,6 +1,6 @@
/* flock.cc. NT specific implementation of advisory file locking.
Copyright 2003, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Red Hat, Inc.
Copyright 2003, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Red Hat, Inc.
This file is part of Cygwin.
@@ -1773,7 +1773,7 @@ flock (int fd, int operation)
__try
{
cygheap_fdget cfd (fd, true);
cygheap_fdget cfd (fd);
if (cfd < 0)
__leave;
@@ -1817,7 +1817,7 @@ lockf (int filedes, int function, off_t size)
__try
{
cygheap_fdget cfd (filedes, true);
cygheap_fdget cfd (filedes);
if (cfd < 0)
__leave;