diff options
| author | cptpcrd <31829097+cptpcrd@users.noreply.github.com> | 2021-01-21 10:46:35 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-21 10:46:35 (GMT) |
| commit | 6893523bed4ad701838715380659c245eec71d48 (patch) | |
| tree | 4729832e663fea71fb1cbd469dccdc309eae0fee /Python/fileutils.c | |
| parent | 0654c4c4cc54a325e878154f8b117159d0105cf7 (diff) | |
| download | cpython-6893523bed4ad701838715380659c245eec71d48.zip cpython-6893523bed4ad701838715380659c245eec71d48.tar.gz cpython-6893523bed4ad701838715380659c245eec71d48.tar.bz2 | |
bpo-42780: Fix set_inheritable() for O_PATH file descriptors on Linux (GH-24172) (GH-24278)
(cherry picked from commit 7dc71c425cf6aa6a4070a418dce5d95ca435c79f)
Diffstat (limited to 'Python/fileutils.c')
| -rw-r--r-- | Python/fileutils.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Python/fileutils.c b/Python/fileutils.c index 397ac34..ddc0909 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); |