From 6893523bed4ad701838715380659c245eec71d48 Mon Sep 17 00:00:00 2001
From: cptpcrd <31829097+cptpcrd@users.noreply.github.com>
Date: Thu, 21 Jan 2021 05:46:35 -0500
Subject: bpo-42780: Fix set_inheritable() for O_PATH file descriptors on Linux
 (GH-24172) (GH-24278)

(cherry picked from commit 7dc71c425cf6aa6a4070a418dce5d95ca435c79f)
---
 Python/fileutils.c | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'Python/fileutils.c')

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);
-- 
cgit v1.2.1