Changeset 163292 in webkit

Timestamp:

Feb 3, 2014 12:19:13 AM (10 years ago)

Author:

berto@igalia.com

Message:

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):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Platform/IPC/unix/ConnectionUnix.cpp (modified) (1 diff)
• Platform/unix/SharedMemoryUnix.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+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-02  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebKit2/Platform/IPC/unix/ConnectionUnix.cpp

@@ -322 +322 @@
 
                 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();

trunk/Source/WebKit2/Platform/unix/SharedMemoryUnix.cpp

@@ -201 +201 @@
     }
 
-    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();