Global: add missing O_CLOEXEC to open()

apocelipes · CarterLi · commit 3291a9945f07 · 2025-06-19T22:40:06.000+08:00
diff --git a/src/common/io/io_unix.c b/src/common/io/io_unix.c
@@ -290,7 +290,7 @@ bool ffSuppressIO(bool suppress)
 
 void listFilesRecursively(uint32_t baseLength, FFstrbuf* folder, uint8_t indentation, const char* folderName, bool pretty)
 {
-    FF_AUTO_CLOSE_FD int dfd = open(folder->chars, O_RDONLY);
+    FF_AUTO_CLOSE_FD int dfd = open(folder->chars, O_RDONLY | O_CLOEXEC);
     if (dfd < 0)
         return;
 
diff --git a/src/detection/battery/battery_nbsd.c b/src/detection/battery/battery_nbsd.c
@@ -16,8 +16,8 @@
 
 const char* ffDetectBattery(FF_MAYBE_UNUSED FFBatteryOptions* options, FFlist* results)
 {
-    FF_AUTO_CLOSE_FD int fd = open(_PATH_SYSMON, O_RDONLY);
-    if (fd < 0) return "open(_PATH_SYSMON, O_RDONLY) failed";
+    FF_AUTO_CLOSE_FD int fd = open(_PATH_SYSMON, O_RDONLY | O_CLOEXEC);
+    if (fd < 0) return "open(_PATH_SYSMON, O_RDONLY | O_CLOEXEC) failed";
 
     prop_dictionary_t root = NULL;
     if (prop_dictionary_recv_ioctl(fd, ENVSYS_GETDICTIONARY, &root) < 0)
diff --git a/src/detection/battery/battery_obsd.c b/src/detection/battery/battery_obsd.c
@@ -8,9 +8,9 @@
 
 const char* ffDetectBattery(FF_MAYBE_UNUSED FFBatteryOptions* options, FFlist* result)
 {
-    FF_AUTO_CLOSE_FD int devfd = open("/dev/apm", O_RDONLY);
+    FF_AUTO_CLOSE_FD int devfd = open("/dev/apm", O_RDONLY | O_CLOEXEC);
 
-    if (devfd < 0) return "open(dev/apm, O_RDONLY) failed";
+    if (devfd < 0) return "open(dev/apm, O_RDONLY | O_CLOEXEC) failed";
 
     struct apm_power_info info = {};
 
diff --git a/src/detection/bootmgr/bootmgr_bsd.c b/src/detection/bootmgr/bootmgr_bsd.c
@@ -20,7 +20,7 @@
 
 const char* ffDetectBootmgr(FFBootmgrResult* result)
 {
-    FF_AUTO_CLOSE_FD int efifd = open("/dev/efi", O_RDWR);
+    FF_AUTO_CLOSE_FD int efifd = open("/dev/efi", O_RDWR | O_CLOEXEC);
     if (efifd < 0) return "open(/dev/efi) failed";
 
     uint8_t buffer[2048];
diff --git a/src/detection/brightness/brightness_obsd.c b/src/detection/brightness/brightness_obsd.c
@@ -12,7 +12,7 @@ const char* ffDetectBrightness(FF_MAYBE_UNUSED FFBrightnessOptions* options, FFl
     for (char i = '0'; i <= '9'; ++i) {
         path[strlen("/dev/ttyC")] = i;
 
-        FF_AUTO_CLOSE_FD int devfd = open(path, O_RDONLY);
+        FF_AUTO_CLOSE_FD int devfd = open(path, O_RDONLY | O_CLOEXEC);
 
         if (devfd < 0) {
             if (errno == EACCES && i == '0')
diff --git a/src/detection/camera/camera_linux.c b/src/detection/camera/camera_linux.c
@@ -20,7 +20,7 @@ const char* ffDetectCamera(FFlist* result)
     for (uint32_t i = 0; i <= 9; ++i)
     {
         path[ARRAY_SIZE(path) - 2] = (char) (i + '0');
-        FF_AUTO_CLOSE_FD int fd = open(path, O_RDONLY);
+        FF_AUTO_CLOSE_FD int fd = open(path, O_RDONLY | O_CLOEXEC);
         if (fd < 0)
         {
             if (errno == ENOENT)
diff --git a/src/detection/cpu/cpu_linux.c b/src/detection/cpu/cpu_linux.c
@@ -474,7 +474,7 @@ FF_MAYBE_UNUSED static const char* detectCPUX86(const FFCPUOptions* options, FFC
 
 static const char* detectPhysicalCores(FFCPUResult* cpu)
 {
-    int dfd = open("/sys/devices/system/cpu/", O_RDONLY | O_DIRECTORY);
+    int dfd = open("/sys/devices/system/cpu/", O_RDONLY | O_DIRECTORY | O_CLOEXEC);
     if (dfd < 0) return "open(\"/sys/devices/system/cpu/\") failed";
 
     FF_AUTO_CLOSE_DIR DIR* dir = fdopendir(dfd);
diff --git a/src/detection/cpu/cpu_nbsd.c b/src/detection/cpu/cpu_nbsd.c
@@ -18,8 +18,8 @@ static void freePropDict(prop_dictionary_t* pdict)
 
 static const char* detectCpuTemp(double* current)
 {
-    FF_AUTO_CLOSE_FD int fd = open(_PATH_SYSMON, O_RDONLY);
-    if (fd < 0) return "open(_PATH_SYSMON, O_RDONLY) failed";
+    FF_AUTO_CLOSE_FD int fd = open(_PATH_SYSMON, O_RDONLY | O_CLOEXEC);
+    if (fd < 0) return "open(_PATH_SYSMON, O_RDONLY | O_CLOEXEC) failed";
 
     __attribute__((__cleanup__(freePropDict))) prop_dictionary_t root = NULL;
     if (prop_dictionary_recv_ioctl(fd, ENVSYS_GETDICTIONARY, &root) < 0)
diff --git a/src/detection/gpu/gpu_bsd.c b/src/detection/gpu/gpu_bsd.c
@@ -96,7 +96,7 @@ static const char* detectByDrm(const FFGPUOptions* options, FFlist* gpus)
             break;
         }
 
-        FF_AUTO_CLOSE_FD int fd = open(path, O_RDONLY);
+        FF_AUTO_CLOSE_FD int fd = open(path, O_RDONLY | O_CLOEXEC);
         if (fd < 0) continue;
 
         char driverName[64];
@@ -147,9 +147,9 @@ static const char* detectByDrm(const FFGPUOptions* options, FFlist* gpus)
 
 static const char* detectByPci(const FFGPUOptions* options, FFlist* gpus)
 {
-    FF_AUTO_CLOSE_FD int fd = open("/dev/pci", O_RDONLY, 0);
+    FF_AUTO_CLOSE_FD int fd = open("/dev/pci", O_RDONLY | O_CLOEXEC, 0);
     if (fd < 0)
-        return "open(\"/dev/pci\", O_RDONLY, 0) failed";
+        return "open(\"/dev/pci\", O_RDONLY | O_CLOEXEC, 0) failed";
 
     struct pci_conf confs[128];
     struct pci_match_conf match = {
diff --git a/src/detection/gpu/gpu_drm.c b/src/detection/gpu/gpu_drm.c
@@ -16,7 +16,7 @@
 
 const char* ffDrmDetectRadeon(const FFGPUOptions* options, FFGPUResult* gpu, const char* renderPath)
 {
-    FF_AUTO_CLOSE_FD int fd = open(renderPath, O_RDONLY);
+    FF_AUTO_CLOSE_FD int fd = open(renderPath, O_RDONLY | O_CLOEXEC);
     if (fd < 0) return "Failed to open DRM render device";
 
     uint32_t value;
@@ -86,7 +86,7 @@ const char* ffDrmDetectAmdgpu(const FFGPUOptions* options, FFGPUResult* gpu, con
     FF_LIBRARY_LOAD_SYMBOL_MESSAGE(libdrm, amdgpu_query_heap_info)
     FF_LIBRARY_LOAD_SYMBOL_MESSAGE(libdrm, amdgpu_device_deinitialize)
 
-    FF_AUTO_CLOSE_FD int fd = open(renderPath, O_RDONLY);
+    FF_AUTO_CLOSE_FD int fd = open(renderPath, O_RDONLY | O_CLOEXEC);
     if (fd < 0) return "Failed to open DRM render device";
 
     amdgpu_device_handle handle;
diff --git a/src/detection/gpu/gpu_haiku.c b/src/detection/gpu/gpu_haiku.c
@@ -5,7 +5,7 @@
 
 const char* ffDetectGPUImpl(FF_MAYBE_UNUSED const FFGPUOptions* options, FFlist* gpus)
 {
-    FF_AUTO_CLOSE_FD int pokefd = open(POKE_DEVICE_FULLNAME, O_RDWR);
+    FF_AUTO_CLOSE_FD int pokefd = open(POKE_DEVICE_FULLNAME, O_RDWR | O_CLOEXEC);
     if (pokefd < 0) return "open(POKE_DEVICE_FULLNAME) failed";
 
     pci_info dev;
diff --git a/src/detection/gpu/gpu_linux.c b/src/detection/gpu/gpu_linux.c
@@ -249,7 +249,7 @@ static const char* drmDetectIntelSpecific(FFGPUResult* gpu, const char* drmKey,
     #if FF_HAVE_DRM
     ffStrbufSetS(buffer, "/dev/dri/");
     ffStrbufAppendS(buffer, drmKey);
-    FF_AUTO_CLOSE_FD int fd = open(buffer->chars, O_RDONLY);
+    FF_AUTO_CLOSE_FD int fd = open(buffer->chars, O_RDONLY | O_CLOEXEC);
     if (fd < 0) return "Failed to open drm device";
 
     if (ffStrbufEqualS(&gpu->driver, "xe"))
@@ -412,7 +412,7 @@ FF_MAYBE_UNUSED static const char* drmDetectAsahiSpecific(FFGPUResult* gpu, cons
     #if FF_HAVE_DRM_ASAHI
     ffStrbufSetS(buffer, "/dev/dri/");
     ffStrbufAppendS(buffer, drmKey);
-    FF_AUTO_CLOSE_FD int fd = open(buffer->chars, O_RDONLY);
+    FF_AUTO_CLOSE_FD int fd = open(buffer->chars, O_RDONLY | O_CLOEXEC);
     if (fd >= 0)
         return ffDrmDetectAsahi(gpu, fd);
     #endif
diff --git a/src/detection/physicaldisk/physicaldisk_haiku.c b/src/detection/physicaldisk/physicaldisk_haiku.c
@@ -10,7 +10,7 @@
 
 static const char* detectDisk(FFstrbuf* path, const char* diskType, FFlist* result)
 {
-    FF_AUTO_CLOSE_FD int rawfd = open(path->chars, O_RDONLY);
+    FF_AUTO_CLOSE_FD int rawfd = open(path->chars, O_RDONLY | O_CLOEXEC);
     if (rawfd < 0) return "detectDisk: open(rawfd) failed";
 
     device_geometry geometry;
diff --git a/src/detection/sound/sound_bsd.c b/src/detection/sound/sound_bsd.c
@@ -32,7 +32,7 @@ const char* ffDetectSound(FFlist* devices)
     for (int idev = 0; idev <= info.nummixers; ++idev)
     {
         path[strlen("/dev/mixer")] = (char) ('0' + idev);
-        FF_AUTO_CLOSE_FD int fd = open(path, O_RDWR);
+        FF_AUTO_CLOSE_FD int fd = open(path, O_RDWR | O_CLOEXEC);
         if (fd < 0) break;
 
         if (idev == 0)
diff --git a/src/detection/sound/sound_nbsd.c b/src/detection/sound/sound_nbsd.c
@@ -25,7 +25,7 @@ const char* ffDetectSound(FFlist* devices)
     for (int idev = 0; idev < 9; ++idev)
     {
         path[strlen("/dev/audio")] = (char) ('0' + idev);
-        FF_AUTO_CLOSE_FD int fd = open(path, O_RDWR);
+        FF_AUTO_CLOSE_FD int fd = open(path, O_RDWR | O_CLOEXEC);
         if (fd < 0) break;
 
         audio_device_t ad;
diff --git a/src/util/binary_linux.c b/src/util/binary_linux.c
@@ -63,7 +63,7 @@ const char* ffBinaryExtractStrings(const char* elfFile, bool (*cb)(const char* s
         return "load libelf failed";
 
     // Open the ELF file
-    FF_AUTO_CLOSE_FD int fd = open(elfFile, O_RDONLY, 0);
+    FF_AUTO_CLOSE_FD int fd = open(elfFile, O_RDONLY | O_CLOEXEC, 0);
     if (fd < 0) return "open() failed";
 
     Elf* elf = elfData.ffelf_begin(fd, ELF_C_READ, NULL);
diff --git a/src/util/smbiosHelper.c b/src/util/smbiosHelper.c
@@ -183,7 +183,7 @@ const FFSmbiosHeaderTable* ffGetSmbiosHeaderTable()
             }
             FF_DEBUG("Parsed SMBIOS entry address: 0x%lx", (unsigned long)entryAddress);
 
-            FF_AUTO_CLOSE_FD int fd = open("/dev/mem", O_RDONLY);
+            FF_AUTO_CLOSE_FD int fd = open("/dev/mem", O_RDONLY | O_CLOEXEC);
             if (fd < 0) {
                 FF_DEBUG("Failed to open /dev/mem: %s", strerror(errno));
                 return NULL;
@@ -219,7 +219,7 @@ const FFSmbiosHeaderTable* ffGetSmbiosHeaderTable()
                 #endif
             );
 
-            FF_AUTO_CLOSE_FD int fd = open("/dev/smbios", O_RDONLY);
+            FF_AUTO_CLOSE_FD int fd = open("/dev/smbios", O_RDONLY | O_CLOEXEC);
             if (fd < 0) {
                 FF_DEBUG("Failed to open /dev/smbios: %s", strerror(errno));
                 return NULL;
@@ -328,7 +328,7 @@ const FFSmbiosHeaderTable* ffGetSmbiosHeaderTable()
                 #else
                 "/dev/mem" // kern.securelevel must be -1
                 #endif
-            , O_RDONLY);
+            , O_RDONLY | O_CLOEXEC);
             if (fd < 0) {
                 FF_DEBUG("Failed to open memory device: %s", strerror(errno));
                 return NULL;

Original file line number	Diff line number	Diff line change
`@@ -290,7 +290,7 @@ bool ffSuppressIO(bool suppress)`
`290`	`290`
`291`	`291`	`void listFilesRecursively(uint32_t baseLength, FFstrbuf* folder, uint8_t indentation, const char* folderName, bool pretty)`
`292`	`292`	`{`
`293`		`- FF_AUTO_CLOSE_FD int dfd = open(folder->chars, O_RDONLY);`
	`293`	`+ FF_AUTO_CLOSE_FD int dfd = open(folder->chars, O_RDONLY \| O_CLOEXEC);`
`294`	`294`	`if (dfd < 0)`
`295`	`295`	`return;`
`296`	`296`
Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,8 @@`
`16`	`16`
`17`	`17`	`const char* ffDetectBattery(FF_MAYBE_UNUSED FFBatteryOptions* options, FFlist* results)`
`18`	`18`	`{`
`19`		`- FF_AUTO_CLOSE_FD int fd = open(_PATH_SYSMON, O_RDONLY);`
`20`		`- if (fd < 0) return "open(_PATH_SYSMON, O_RDONLY) failed";`
	`19`	`+ FF_AUTO_CLOSE_FD int fd = open(_PATH_SYSMON, O_RDONLY \| O_CLOEXEC);`
	`20`	`+ if (fd < 0) return "open(_PATH_SYSMON, O_RDONLY \| O_CLOEXEC) failed";`
`21`	`21`
`22`	`22`	`prop_dictionary_t root = NULL;`
`23`	`23`	`if (prop_dictionary_recv_ioctl(fd, ENVSYS_GETDICTIONARY, &root) < 0)`
Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,9 @@`
`8`	`8`
`9`	`9`	`const char* ffDetectBattery(FF_MAYBE_UNUSED FFBatteryOptions* options, FFlist* result)`
`10`	`10`	`{`
`11`		`- FF_AUTO_CLOSE_FD int devfd = open("/dev/apm", O_RDONLY);`
	`11`	`+ FF_AUTO_CLOSE_FD int devfd = open("/dev/apm", O_RDONLY \| O_CLOEXEC);`
`12`	`12`
`13`		`- if (devfd < 0) return "open(dev/apm, O_RDONLY) failed";`
	`13`	`+ if (devfd < 0) return "open(dev/apm, O_RDONLY \| O_CLOEXEC) failed";`
`14`	`14`
`15`	`15`	`struct apm_power_info info = {};`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`
`21`	`21`	`const char* ffDetectBootmgr(FFBootmgrResult* result)`
`22`	`22`	`{`
`23`		`- FF_AUTO_CLOSE_FD int efifd = open("/dev/efi", O_RDWR);`
	`23`	`+ FF_AUTO_CLOSE_FD int efifd = open("/dev/efi", O_RDWR \| O_CLOEXEC);`
`24`	`24`	`if (efifd < 0) return "open(/dev/efi) failed";`
`25`	`25`
`26`	`26`	`uint8_t buffer[2048];`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ const char* ffDetectCamera(FFlist* result)`
`20`	`20`	`for (uint32_t i = 0; i <= 9; ++i)`
`21`	`21`	`{`
`22`	`22`	`path[ARRAY_SIZE(path) - 2] = (char) (i + '0');`
`23`		`- FF_AUTO_CLOSE_FD int fd = open(path, O_RDONLY);`
	`23`	`+ FF_AUTO_CLOSE_FD int fd = open(path, O_RDONLY \| O_CLOEXEC);`
`24`	`24`	`if (fd < 0)`
`25`	`25`	`{`
`26`	`26`	`if (errno == ENOENT)`
Original file line number	Diff line number	Diff line change
`@@ -474,7 +474,7 @@ FF_MAYBE_UNUSED static const char* detectCPUX86(const FFCPUOptions* options, FFC`
`474`	`474`
`475`	`475`	`static const char* detectPhysicalCores(FFCPUResult* cpu)`
`476`	`476`	`{`
`477`		`- int dfd = open("/sys/devices/system/cpu/", O_RDONLY \| O_DIRECTORY);`
	`477`	`+ int dfd = open("/sys/devices/system/cpu/", O_RDONLY \| O_DIRECTORY \| O_CLOEXEC);`
`478`	`478`	`if (dfd < 0) return "open(\"/sys/devices/system/cpu/\") failed";`
`479`	`479`
`480`	`480`	`FF_AUTO_CLOSE_DIR DIR* dir = fdopendir(dfd);`
Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,8 @@ static void freePropDict(prop_dictionary_t* pdict)`
`18`	`18`
`19`	`19`	`static const char* detectCpuTemp(double* current)`
`20`	`20`	`{`
`21`		`- FF_AUTO_CLOSE_FD int fd = open(_PATH_SYSMON, O_RDONLY);`
`22`		`- if (fd < 0) return "open(_PATH_SYSMON, O_RDONLY) failed";`
	`21`	`+ FF_AUTO_CLOSE_FD int fd = open(_PATH_SYSMON, O_RDONLY \| O_CLOEXEC);`
	`22`	`+ if (fd < 0) return "open(_PATH_SYSMON, O_RDONLY \| O_CLOEXEC) failed";`
`23`	`23`
`24`	`24`	`__attribute__((__cleanup__(freePropDict))) prop_dictionary_t root = NULL;`
`25`	`25`	`if (prop_dictionary_recv_ioctl(fd, ENVSYS_GETDICTIONARY, &root) < 0)`