mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-09-02 15:25:21 +00:00
Code Issues Releases Wiki Activity

zdtm.py: Fix race in root construction

Browse Source 
If two ns_flavor.init() are called in parallel then all the os.mkdir()
calls would end up with EEXISTS exception.

Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Pavel Emelyanov
2015-11-12 21:21:00 +03:00
parent a96320604b
commit bada292932
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
test/zdtm.py
View File

@@ -17,6 +17,7 @@ import random
import string import string
import imp import imp
import socket import socket
import fcntl
os.chdir(os.path.dirname(os.path.abspath(__file__))) os.chdir(os.path.dirname(os.path.abspath(__file__)))
@@ -138,19 +139,22 @@ class ns_flavor:
self.__copy_one(lib) self.__copy_one(lib)
def init(self, test_bin, deps): def init(self, test_bin, deps):
print "Construct root for %s" % test_bin
subprocess.check_call(["mount", "--make-private", "--bind", ".", self.root]) subprocess.check_call(["mount", "--make-private", "--bind", ".", self.root])
if not os.access(self.root + "/.constructed", os.F_OK): if not os.access(self.root + "/.constructed", os.F_OK):
for dir in ["/bin", "/sbin", "/etc", "/lib", "/lib64", "/dev", "/tmp", "/usr"]: with open(os.path.abspath(__file__)) as o:
os.mkdir(self.root + dir) fcntl.flock(o, fcntl.LOCK_EX)
os.chmod(self.root + dir, 0777) if not os.access(self.root + "/.constructed", os.F_OK):
print "Construct root for %s" % test_bin
for dir in ["/bin", "/sbin", "/etc", "/lib", "/lib64", "/dev", "/tmp", "/usr"]:
os.mkdir(self.root + dir)
os.chmod(self.root + dir, 0777)
os.mknod(self.root + "/dev/tty", stat.S_IFCHR, os.makedev(5, 0)) os.mknod(self.root + "/dev/tty", stat.S_IFCHR, os.makedev(5, 0))
os.chmod(self.root + "/dev/tty", 0666) os.chmod(self.root + "/dev/tty", 0666)
os.mknod(self.root + "/.constructed", stat.S_IFREG | 0600) for ldir in [ "/bin", "/sbin", "/lib", "/lib64" ]:
for ldir in [ "/bin", "/sbin", "/lib", "/lib64" ]: os.symlink(".." + ldir, self.root + "/usr" + ldir)
os.symlink(".." + ldir, self.root + "/usr" + ldir) os.mknod(self.root + "/.constructed", stat.S_IFREG | 0600)
self.__copy_libs(test_bin) self.__copy_libs(test_bin)
for dep in deps: for dep in deps: