Close file descriptors when executing sub-processes

Pass close_fds=True to subprocess.Popen(), as is currently done in nova.utils.execute(). Note that this folsom-stable branch fix is not a cherry-pick of the master branch fix at https://review.openstack.org/22486 due to prior refactoring in grizzly. Fixes bug #1130735 Change-Id: Ia7a889b21a8069b559cb4641480abf416dfc903c
openstack · Feb 20, 2013 · 30bb632 · 30bb632
1 parent 4de49b4
commit 30bb632
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/quantum/agent/linux/utils.py b/quantum/agent/linux/utils.py
@@ -49,7 +49,7 @@ def execute(cmd, root_helper=None, process_input=None, addl_env=None,
         env.update(addl_env)
     obj = subprocess.Popen(cmd, shell=False, stdin=subprocess.PIPE,
                            stdout=subprocess.PIPE, stderr=subprocess.PIPE,
-                           preexec_fn=_subprocess_setup,
+                           preexec_fn=_subprocess_setup, close_fds=True,
                            env=env)
 
     _stdout, _stderr = (process_input and

diff --git a/quantum/common/utils.py b/quantum/common/utils.py
@@ -61,7 +61,7 @@ def execute(cmd, process_input=None, addl_env=None, check_exit_code=True):
         env.update(addl_env)
     obj = subprocess.Popen(cmd, shell=True, stdin=subprocess.PIPE,
                            stdout=subprocess.PIPE, stderr=subprocess.PIPE,
-                           preexec_fn=_subprocess_setup,
+                           preexec_fn=_subprocess_setup, close_fds=True,
                            env=env)
     result = None
     if process_input is not None: