From: Sapan Bhatia <gwsapan@gmail.com>
Date: Thu, 6 Sep 2012 13:26:14 +0000 (-0400)
Subject: bug fix in dropping capabilities
X-Git-Tag: lxctools-0.9-1~11
X-Git-Url: http://git.onelab.eu/?p=lxc-userspace.git;a=commitdiff_plain;h=5890874ae327145958ce7ad96ddc83441823ffb4

bug fix in dropping capabilities
---

diff --git a/lxcsu b/lxcsu
old mode 100755
new mode 100644
index 05899d2..ea63d18
--- a/lxcsu
+++ b/lxcsu
@@ -6,7 +6,7 @@ import os
 
 from optparse import OptionParser
 
-drop_capabilities='cap_sys_admin,cap_net_admin,cap_sys_boot,cap_sys_module'
+drop_capabilities='cap_sys_admin,cap_net_admin,cap_sys_boot,cap_sys_module'.split(',')
 
 parser = OptionParser()
 parser.add_option("-n", "--net",
@@ -63,4 +63,12 @@ r3 = setns.chcontext(path)
 
 open('/proc/lxcsu','w').write(pid)
 open('/proc/pidsu','w').write(pid)
-os.execv('/usr/sbin/capsh',['--drop',drop_capabilities,'--'])
+
+pid = os.fork()
+
+cap_args = map(lambda c:'--drop='+c, drop_capabilities)
+    
+if (pid == 0):
+    os.execv('/usr/sbin/capsh',cap_args+['--'])
+else:
+    os.waitpid(pid,0)