Skip to content

Commit 962ed51

Browse files
committed
gh-161408: Prevent multiprocessing descriptors leaking across exec
1 parent eb7cd6e commit 962ed51

5 files changed

Lines changed: 76 additions & 2 deletions

File tree

‎Lib/multiprocessing/forkserver.py‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,11 @@ def _serve_one(child_r, fds, unused_fds, handlers):
448448
for fd in unused_fds:
449449
os.close(fd)
450450

451+
# SCM_RIGHTS and the forkserver's own fds must not leak through
452+
# subsequent execs by the worker process.
453+
for inherited_fd in (child_r, *fds):
454+
os.set_inheritable(inherited_fd, False)
455+
451456
(_forkserver._forkserver_alive_fd,
452457
resource_tracker._resource_tracker._fd,
453458
*_forkserver._inherited_fds) = fds

‎Lib/multiprocessing/popen_spawn_posix.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ class _DupFd(object):
1717
def __init__(self, fd):
1818
self.fd = fd
1919
def detach(self):
20+
os.set_inheritable(self.fd, False)
2021
return self.fd
2122

2223
#
@@ -53,7 +54,8 @@ def _launch(self, process_obj):
5354
parent_r, child_w = os.pipe()
5455
child_r, parent_w = os.pipe()
5556
cmd = spawn.get_command_line(tracker_fd=tracker_fd,
56-
pipe_handle=child_r)
57+
pipe_handle=child_r,
58+
sentinel_fd=child_w)
5759
self._fds.extend([child_r, child_w])
5860
self.pid = util.spawnv_passfds(spawn.get_executable(),
5961
cmd, self._fds)

‎Lib/multiprocessing/spawn.py‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ def get_command_line(**kwds):
9595
return [exe] + opts + ['-c', prog, '--multiprocessing-fork']
9696

9797

98-
def spawn_main(pipe_handle, parent_pid=None, tracker_fd=None):
98+
def spawn_main(pipe_handle, parent_pid=None, tracker_fd=None, sentinel_fd=None):
9999
'''
100100
Run code specified by data received over pipe
101101
'''
@@ -117,6 +117,11 @@ def spawn_main(pipe_handle, parent_pid=None, tracker_fd=None):
117117
else:
118118
from . import resource_tracker
119119
resource_tracker._resource_tracker._fd = tracker_fd
120+
# These fds must survive the initial exec, but not further execs
121+
# made by the process after it has started.
122+
for inherited_fd in (pipe_handle, tracker_fd, sentinel_fd):
123+
if inherited_fd is not None:
124+
os.set_inheritable(inherited_fd, False)
120125
fd = pipe_handle
121126
parent_sentinel = os.dup(pipe_handle)
122127
exitcode = _main(fd, parent_sentinel)

‎Lib/test/_test_multiprocessing.py‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6296,6 +6296,65 @@ def test_closefd(self):
62966296
self.assertTrue(e.errno == errno.EBADF or
62976297
e.winerror == WSAENOTSOCK, e)
62986298

6299+
@staticmethod
6300+
def _test_passed_fds_are_not_inheritable(conn):
6301+
from multiprocessing import resource_tracker
6302+
fds = [conn.fileno(), resource_tracker._resource_tracker._fd]
6303+
if multiprocessing.get_start_method() == 'forkserver':
6304+
from multiprocessing import forkserver
6305+
fds.append(forkserver._forkserver._forkserver_alive_fd)
6306+
conn.send([os.get_inheritable(fd) for fd in fds])
6307+
6308+
@unittest.skipIf(WIN32, "POSIX file descriptors only")
6309+
def test_passed_fds_are_not_inheritable(self):
6310+
if multiprocessing.get_start_method() not in ('spawn', 'forkserver'):
6311+
self.skipTest("only applies to spawn and forkserver")
6312+
reader, writer = multiprocessing.Pipe(duplex=False)
6313+
try:
6314+
p = multiprocessing.Process(
6315+
target=self._test_passed_fds_are_not_inheritable,
6316+
args=(writer,))
6317+
p.start()
6318+
writer.close()
6319+
self.assertEqual(reader.recv(), [False] *
6320+
(3 if multiprocessing.get_start_method() == 'forkserver'
6321+
else 2))
6322+
join_process(p)
6323+
finally:
6324+
writer.close()
6325+
reader.close()
6326+
6327+
@staticmethod
6328+
def _test_exec_grandchild(conn):
6329+
grandchild = subprocess.Popen(
6330+
[sys.executable, '-c', 'import time; time.sleep(30)'],
6331+
stdin=subprocess.DEVNULL, stdout=subprocess.DEVNULL,
6332+
stderr=subprocess.DEVNULL, close_fds=False)
6333+
conn.send(grandchild.pid)
6334+
6335+
@unittest.skipIf(WIN32, "POSIX file descriptors only")
6336+
@only_run_in_spawn_testsuite("spawn sentinel file descriptor")
6337+
def test_spawn_sentinel_does_not_leak_to_exec(self):
6338+
reader, writer = multiprocessing.Pipe(duplex=False)
6339+
grandchild_pid = None
6340+
p = multiprocessing.Process(target=self._test_exec_grandchild,
6341+
args=(writer,))
6342+
try:
6343+
p.start()
6344+
writer.close()
6345+
grandchild_pid = reader.recv()
6346+
p.join(timeout=2)
6347+
self.assertEqual(p.exitcode, 0)
6348+
finally:
6349+
if grandchild_pid is not None:
6350+
try:
6351+
os.kill(grandchild_pid, signal.SIGTERM)
6352+
except ProcessLookupError:
6353+
pass
6354+
p.join(timeout=support.SHORT_TIMEOUT)
6355+
writer.close()
6356+
reader.close()
6357+
62996358
#
63006359
# Issue #17097: EINTR should be ignored by recv(), send(), accept() etc
63016360
#
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Prevent :mod:`multiprocessing` ``spawn`` and ``forkserver`` workers from leaking
2+
internal file descriptors to programs launched by those workers. This avoids
3+
waiting for unrelated descendants when joining a worker.

0 commit comments

Comments
 (0)