Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Lib/multiprocessing/forkserver.py
Original file line number Diff line number Diff line change
Expand Up @@ -448,6 +448,11 @@ def _serve_one(child_r, fds, unused_fds, handlers):
for fd in unused_fds:
os.close(fd)

# SCM_RIGHTS and the forkserver's own fds must not leak through
# subsequent execs by the worker process.
for inherited_fd in (child_r, *fds):
os.set_inheritable(inherited_fd, False)

(_forkserver._forkserver_alive_fd,
resource_tracker._resource_tracker._fd,
*_forkserver._inherited_fds) = fds
Expand Down
4 changes: 3 additions & 1 deletion Lib/multiprocessing/popen_spawn_posix.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ class _DupFd(object):
def __init__(self, fd):
self.fd = fd
def detach(self):
os.set_inheritable(self.fd, False)
return self.fd

#
Expand Down Expand Up @@ -53,7 +54,8 @@ def _launch(self, process_obj):
parent_r, child_w = os.pipe()
child_r, parent_w = os.pipe()
cmd = spawn.get_command_line(tracker_fd=tracker_fd,
pipe_handle=child_r)
pipe_handle=child_r,
sentinel_fd=child_w)
self._fds.extend([child_r, child_w])
self.pid = util.spawnv_passfds(spawn.get_executable(),
cmd, self._fds)
Expand Down
7 changes: 6 additions & 1 deletion Lib/multiprocessing/spawn.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ def get_command_line(**kwds):
return [exe] + opts + ['-c', prog, '--multiprocessing-fork']


def spawn_main(pipe_handle, parent_pid=None, tracker_fd=None):
def spawn_main(pipe_handle, parent_pid=None, tracker_fd=None, sentinel_fd=None):
'''
Run code specified by data received over pipe
'''
Expand All @@ -117,6 +117,11 @@ def spawn_main(pipe_handle, parent_pid=None, tracker_fd=None):
else:
from . import resource_tracker
resource_tracker._resource_tracker._fd = tracker_fd
# These fds must survive the initial exec, but not further execs
# made by the process after it has started.
for inherited_fd in (pipe_handle, tracker_fd, sentinel_fd):
if inherited_fd is not None:
os.set_inheritable(inherited_fd, False)
fd = pipe_handle
parent_sentinel = os.dup(pipe_handle)
exitcode = _main(fd, parent_sentinel)
Expand Down
29 changes: 29 additions & 0 deletions Lib/test/_test_multiprocessing.py
Original file line number Diff line number Diff line change
Expand Up @@ -6296,6 +6296,35 @@ def test_closefd(self):
self.assertTrue(e.errno == errno.EBADF or
e.winerror == WSAENOTSOCK, e)

@staticmethod
def _test_passed_fds_are_not_inheritable(conn):
from multiprocessing import resource_tracker
fds = [conn.fileno(), resource_tracker._resource_tracker._fd]
if multiprocessing.get_start_method() == 'forkserver':
from multiprocessing import forkserver
fds.append(forkserver._forkserver._forkserver_alive_fd)
conn.send([os.get_inheritable(fd) for fd in fds])

@unittest.skipIf(WIN32, "POSIX file descriptors only")
def test_passed_fds_are_not_inheritable(self):
if multiprocessing.get_start_method() not in ('spawn', 'forkserver'):
self.skipTest("only applies to spawn and forkserver")
reader, writer = multiprocessing.Pipe(duplex=False)
try:
p = multiprocessing.Process(
target=self._test_passed_fds_are_not_inheritable,
args=(writer,))
p.start()
writer.close()
self.assertEqual(reader.recv(), [False] *
(3 if multiprocessing.get_start_method() == 'forkserver'
else 2))
join_process(p)
finally:
writer.close()
reader.close()


#
# Issue #17097: EINTR should be ignored by recv(), send(), accept() etc
#
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Prevent :mod:`multiprocessing` ``spawn`` and ``forkserver`` workers from leaking
internal file descriptors to programs launched by those workers. This avoids
waiting for unrelated descendants when joining a worker.
Loading