From: Erlend E. Aasland <erlend@python.org>
Date: Wed, 28 Jun 2023 11:11:32 +0000 (+0200)
Subject: gh-106118: Add O_CLOEXEC preprocessor guard (#106120)
X-Git-Tag: v3.13.0a1~1614
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c60684bf5d34fae27a2f6a142ff794b38cefe1b;p=thirdparty%2FPython%2Fcpython.git

gh-106118: Add O_CLOEXEC preprocessor guard (#106120)
---

diff --git a/Misc/NEWS.d/next/Build/2023-06-26-21-56-29.gh-issue-106118.0cCfhl.rst b/Misc/NEWS.d/next/Build/2023-06-26-21-56-29.gh-issue-106118.0cCfhl.rst
new file mode 100644
index 000000000000..f93cae5d03b5
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2023-06-26-21-56-29.gh-issue-106118.0cCfhl.rst
@@ -0,0 +1,2 @@
+Fix compilation for platforms without :data:`!O_CLOEXEC`. The issue was
+introduced with Python 3.12b1 in :gh:`103295`. Patch by Erlend Aasland.
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
index 3284e14e7742..0cd8974d1971 100644
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -2277,7 +2277,10 @@ PyAPI_FUNC(int) PyUnstable_PerfMapState_Init(void) {
     char filename[100];
     pid_t pid = getpid();
     // Use nofollow flag to prevent symlink attacks.
-    int flags = O_WRONLY | O_CREAT | O_APPEND | O_NOFOLLOW | O_CLOEXEC;
+    int flags = O_WRONLY | O_CREAT | O_APPEND | O_NOFOLLOW;
+#ifdef O_CLOEXEC
+    flags |= O_CLOEXEC;
+#endif
     snprintf(filename, sizeof(filename) - 1, "/tmp/perf-%jd.map",
                 (intmax_t)pid);
     int fd = open(filename, flags, 0600);