@@ -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#
0 commit comments