Merge r163292 - Fix wrong mix of fcntl commands and flags

https://bugs.webkit.org/show_bug.cgi?id=127842 Reviewed by Darin Adler. We are mixing the commands to set file descriptor and file status flags in a couple of fcntl() calls. FD_CLOEXEC must be set using F_SETFD, and the access mode flags (O_RDONLY, O_WRONLY, O_RDWR) with F_SETFL. This combines patches by Guillem Jover and Sergio Correia. * Platform/IPC/unix/ConnectionUnix.cpp: (IPC::readBytesFromSocket): * Platform/unix/SharedMemoryUnix.cpp: (WebKit::SharedMemory::createHandle):
WebKit · Feb 10, 2014 · aea46d5 · aea46d5
1 parent 9e4f9f5
commit aea46d5
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
@@ -1,3 +1,22 @@
+2014-02-03  Alberto Garcia  <berto@igalia.com>
+
+        Fix wrong mix of fcntl commands and flags
+        https://bugs.webkit.org/show_bug.cgi?id=127842
+
+        Reviewed by Darin Adler.
+
+        We are mixing the commands to set file descriptor and file status
+        flags in a couple of fcntl() calls. FD_CLOEXEC must be set using
+        F_SETFD, and the access mode flags (O_RDONLY, O_WRONLY, O_RDWR)
+        with F_SETFL.
+
+        This combines patches by Guillem Jover and Sergio Correia.
+
+        * Platform/IPC/unix/ConnectionUnix.cpp:
+        (IPC::readBytesFromSocket):
+        * Platform/unix/SharedMemoryUnix.cpp:
+        (WebKit::SharedMemory::createHandle):
+
 2014-02-05  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         Unreviewed. Fix make distcheck.

diff --git a/Source/WebKit2/Platform/IPC/unix/ConnectionUnix.cpp b/Source/WebKit2/Platform/IPC/unix/ConnectionUnix.cpp
@@ -321,7 +321,7 @@ static ssize_t readBytesFromSocket(int socketDescriptor, uint8_t* buffer, int co
                 memcpy(fileDescriptors, CMSG_DATA(controlMessage), sizeof(int) * *fileDescriptorsCount);
 
                 for (size_t i = 0; i < *fileDescriptorsCount; ++i) {
-                    while (fcntl(fileDescriptors[i], F_SETFL, FD_CLOEXEC) == -1) {
+                    while (fcntl(fileDescriptors[i], F_SETFD, FD_CLOEXEC) == -1) {
                         if (errno != EINTR) {
                             ASSERT_NOT_REACHED();
                             break;

diff --git a/Source/WebKit2/Platform/unix/SharedMemoryUnix.cpp b/Source/WebKit2/Platform/unix/SharedMemoryUnix.cpp
@@ -200,7 +200,7 @@ bool SharedMemory::createHandle(Handle& handle, Protection protection)
         }
     }
 
-    while ((fcntl(duplicatedHandle, F_SETFD, FD_CLOEXEC | accessModeFile(protection)) == -1)) {
+    while (fcntl(duplicatedHandle, F_SETFD, FD_CLOEXEC) == -1 || fcntl(duplicatedHandle, F_SETFL, accessModeFile(protection)) == -1) {
         if (errno != EINTR) {
             ASSERT_NOT_REACHED();
             closeWithRetry(duplicatedHandle);