Fix from review

Author: embhorn

src/crl.c

@@ -1712,13 +1712,7 @@ static THREAD_RETURN WOLFSSL_THREAD DoMonitor(void* arg)
         SignalSetup(crl, MONITOR_SETUP_E);
         return NULL;
     }
-#ifdef FD_CLOEXEC
-    {
-        int fdFlags = fcntl(crl->mfd, F_GETFD);
-        if (fdFlags >= 0)
-            (void)fcntl(crl->mfd, F_SETFD, fdFlags | FD_CLOEXEC);
-    }
-#endif
+    wc_set_cloexec(crl->mfd);
 
     /* listen for custom shutdown event */
     EV_SET(&change, CRL_CUSTOM_FD, EVFILT_USER, EV_ADD, 0, 0, NULL);
@@ -1856,11 +1850,7 @@ static THREAD_RETURN WOLFSSL_THREAD DoMonitor(void* arg)
 #ifdef FD_CLOEXEC
     if (crl->mfd < 0 && errno == EINVAL) {
         crl->mfd = eventfd(0, 0);
-        if (crl->mfd >= 0) {
-            int fdFlags = fcntl(crl->mfd, F_GETFD);
-            if (fdFlags >= 0)
-                (void)fcntl(crl->mfd, F_SETFD, fdFlags | FD_CLOEXEC);
-        }
+        wc_set_cloexec(crl->mfd);
     }
 #endif
     if (crl->mfd < 0) {
@@ -1873,23 +1863,11 @@ static THREAD_RETURN WOLFSSL_THREAD DoMonitor(void* arg)
     notifyFd = inotify_init1(IN_CLOEXEC);
     if (notifyFd < 0 && (errno == ENOSYS || errno == EINVAL)) {
         notifyFd = inotify_init();
-    #ifdef FD_CLOEXEC
-        if (notifyFd >= 0) {
-            int fdFlags = fcntl(notifyFd, F_GETFD);
-            if (fdFlags >= 0)
-                (void)fcntl(notifyFd, F_SETFD, fdFlags | FD_CLOEXEC);
-        }
-    #endif
+        wc_set_cloexec(notifyFd);
     }
 #else
     notifyFd = inotify_init();
-    #ifdef FD_CLOEXEC
-    if (notifyFd >= 0) {
-        int fdFlags = fcntl(notifyFd, F_GETFD);
-        if (fdFlags >= 0)
-            (void)fcntl(notifyFd, F_SETFD, fdFlags | FD_CLOEXEC);
-    }
-    #endif
+    wc_set_cloexec(notifyFd);
 #endif
     if (notifyFd < 0) {
         WOLFSSL_MSG("inotify failed");

wolfcrypt/benchmark/benchmark.c

@@ -1596,11 +1596,7 @@ static const char* bench_result_words3[][5] = {
                               PERF_FLAG_FD_CLOEXEC);                           \
         if (cycles < 0 && errno == EINVAL) {                                   \
             cycles = (int)syscall(__NR_perf_event_open, &atr, 0, -1, -1, 0);   \
-            if (cycles >= 0) {                                                 \
-                int _fdFlags = fcntl(cycles, F_GETFD);                         \
-                if (_fdFlags >= 0)                                             \
-                    (void)fcntl(cycles, F_SETFD, _fdFlags | FD_CLOEXEC);       \
-            }                                                                  \
+            wc_set_cloexec(cycles);                                            \
         }                                                                      \
     } while (0);
 

wolfcrypt/src/wc_port.c

@@ -5148,17 +5148,27 @@ char* wolfSSL_strnstr(const char* s1, const char* s2, unsigned int n)
     #define SOCK_CLOEXEC 0
 #endif
 
+void wc_set_cloexec(int fd)
+{
+#ifdef FD_CLOEXEC
+    int fdFlags;
+    if (fd < 0)
+        return;
+    fdFlags = fcntl(fd, F_GETFD);
+    if (fdFlags >= 0)
+        (void)fcntl(fd, F_SETFD, fdFlags | FD_CLOEXEC);
+#else
+    (void)fd;
+#endif
+}
+
 int wc_open_cloexec(const char* path, int flags)
 {
     int fd = open(path, flags | O_CLOEXEC);
 #ifdef FD_CLOEXEC
     if (fd < 0 && errno == EINVAL) {
         fd = open(path, flags);
-        if (fd >= 0) {
-            int fdFlags = fcntl(fd, F_GETFD);
-            if (fdFlags >= 0)
-                (void)fcntl(fd, F_SETFD, fdFlags | FD_CLOEXEC);
-        }
+        wc_set_cloexec(fd);
     }
 #endif
     return fd;
@@ -5170,11 +5180,7 @@ int wc_socket_cloexec(int domain, int type, int protocol)
 #ifdef FD_CLOEXEC
     if (fd < 0 && errno == EINVAL) {
         fd = socket(domain, type, protocol);
-        if (fd >= 0) {
-            int fdFlags = fcntl(fd, F_GETFD);
-            if (fdFlags >= 0)
-                (void)fcntl(fd, F_SETFD, fdFlags | FD_CLOEXEC);
-        }
+        wc_set_cloexec(fd);
     }
 #endif
     return fd;
@@ -5192,13 +5198,7 @@ int wc_accept_cloexec(int sockfd, void* addr, void* addrlen)
         return fd;
 #endif
     fd = accept(sockfd, (struct sockaddr*)addr, (socklen_t*)addrlen);
-#ifdef FD_CLOEXEC
-    if (fd >= 0) {
-        int fdFlags = fcntl(fd, F_GETFD);
-        if (fdFlags >= 0)
-            (void)fcntl(fd, F_SETFD, fdFlags | FD_CLOEXEC);
-    }
-#endif
+    wc_set_cloexec(fd);
     return fd;
 }
 

wolfssl/wolfcrypt/wc_port.h

@@ -1861,6 +1861,7 @@ WOLFSSL_ABI WOLFSSL_API int wolfCrypt_Cleanup(void);
 #endif
 
 #if (defined(__unix__) || defined(__APPLE__)) && !defined(WOLFSSL_ZEPHYR)
+    WOLFSSL_LOCAL void wc_set_cloexec(int fd);
     WOLFSSL_LOCAL int wc_open_cloexec(const char* path, int flags);
     WOLFSSL_LOCAL int wc_socket_cloexec(int domain, int type, int protocol);
     WOLFSSL_LOCAL int wc_accept_cloexec(int sockfd, void* addr, void* addrlen);