diff options
author | 2021-01-21 05:46:35 -0500 | |
---|---|---|
committer | 2021-01-21 11:46:35 +0100 | |
commit | 6893523bed4ad701838715380659c245eec71d48 (patch) | |
tree | 4729832e663fea71fb1cbd469dccdc309eae0fee | |
parent | bpo-42005: profile and cProfile catch BrokenPipeError (GH-22643) (diff) | |
download | cpython-6893523bed4ad701838715380659c245eec71d48.tar.gz cpython-6893523bed4ad701838715380659c245eec71d48.tar.bz2 cpython-6893523bed4ad701838715380659c245eec71d48.zip |
bpo-42780: Fix set_inheritable() for O_PATH file descriptors on Linux (GH-24172) (GH-24278)
(cherry picked from commit 7dc71c425cf6aa6a4070a418dce5d95ca435c79f)
-rw-r--r-- | Lib/test/test_os.py | 27 | ||||
-rw-r--r-- | Misc/NEWS.d/next/Library/2021-01-08-15-49-20.bpo-42780.rtqi6B.rst | 1 | ||||
-rw-r--r-- | Python/fileutils.c | 7 |
3 files changed, 35 insertions, 0 deletions
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py index bf1cb5f511..35933e9c8c 100644 --- a/Lib/test/test_os.py +++ b/Lib/test/test_os.py @@ -3659,6 +3659,33 @@ class FDInheritanceTests(unittest.TestCase): self.assertEqual(fcntl.fcntl(fd, fcntl.F_GETFD) & fcntl.FD_CLOEXEC, 0) + @unittest.skipUnless(hasattr(os, 'O_PATH'), "need os.O_PATH") + def test_get_set_inheritable_o_path(self): + fd = os.open(__file__, os.O_PATH) + self.addCleanup(os.close, fd) + self.assertEqual(os.get_inheritable(fd), False) + + os.set_inheritable(fd, True) + self.assertEqual(os.get_inheritable(fd), True) + + os.set_inheritable(fd, False) + self.assertEqual(os.get_inheritable(fd), False) + + def test_get_set_inheritable_badf(self): + fd = support.make_bad_fd() + + with self.assertRaises(OSError) as ctx: + os.get_inheritable(fd) + self.assertEqual(ctx.exception.errno, errno.EBADF) + + with self.assertRaises(OSError) as ctx: + os.set_inheritable(fd, True) + self.assertEqual(ctx.exception.errno, errno.EBADF) + + with self.assertRaises(OSError) as ctx: + os.set_inheritable(fd, False) + self.assertEqual(ctx.exception.errno, errno.EBADF) + def test_open(self): fd = os.open(__file__, os.O_RDONLY) self.addCleanup(os.close, fd) diff --git a/Misc/NEWS.d/next/Library/2021-01-08-15-49-20.bpo-42780.rtqi6B.rst b/Misc/NEWS.d/next/Library/2021-01-08-15-49-20.bpo-42780.rtqi6B.rst new file mode 100644 index 0000000000..a491690507 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2021-01-08-15-49-20.bpo-42780.rtqi6B.rst @@ -0,0 +1 @@ +Fix os.set_inheritable() for O_PATH file descriptors on Linux. diff --git a/Python/fileutils.c b/Python/fileutils.c index 397ac34e80..ddc090988f 100644 --- a/Python/fileutils.c +++ b/Python/fileutils.c @@ -1165,6 +1165,13 @@ set_inheritable(int fd, int inheritable, int raise, int *atomic_flag_works) return 0; } +#ifdef __linux__ + if (errno == EBADF) { + // On Linux, ioctl(FIOCLEX) will fail with EBADF for O_PATH file descriptors + // Fall through to the fcntl() path + } + else +#endif if (errno != ENOTTY && errno != EACCES) { if (raise) PyErr_SetFromErrno(PyExc_OSError); |