Changeset 179707 in webkit

Timestamp:

Feb 5, 2015 2:13:10 PM (9 years ago)

Author:

Chris Dumez

Message:

[WK2] Properly check for mmap() error case
​https://bugs.webkit.org/show_bug.cgi?id=141304

Reviewed by Anders Carlsson.

mmap() returns MAP_FAILED, which is (void*)-1, not a null pointer in
case of failure. This patch updates several wrong error checks in
WebKit2.

• Platform/IPC/ArgumentEncoder.cpp:

(IPC::allocBuffer):
(IPC::ArgumentEncoder::reserve):

• Platform/IPC/mac/ConnectionMac.mm:

(IPC::Connection::sendOutgoingMessage):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Platform/IPC/ArgumentEncoder.cpp (modified) (2 diffs)
• Platform/IPC/mac/ConnectionMac.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-02-05  Chris Dumez  <cdumez@apple.com>
+
+        [WK2] Properly check for mmap() error case
+        https://bugs.webkit.org/show_bug.cgi?id=141304
+
+        Reviewed by Anders Carlsson.
+
+        mmap() returns MAP_FAILED, which is (void*)-1, not a null pointer in
+        case of failure. This patch updates several wrong error checks in
+        WebKit2.
+
+        * Platform/IPC/ArgumentEncoder.cpp:
+        (IPC::allocBuffer):
+        (IPC::ArgumentEncoder::reserve):
+        * Platform/IPC/mac/ConnectionMac.mm:
+        (IPC::Connection::sendOutgoingMessage):
+
 2015-02-05  Brian J. Burg  <burg@cs.washington.edu>
 

trunk/Source/WebKit2/Platform/IPC/ArgumentEncoder.cpp

@@ -37 +37 @@
 namespace IPC {
 
-static inline void* allocBuffer(size_t size)
+template <typename T>
+static inline bool allocBuffer(T*& buffer, size_t size)
 {
 #if OS(DARWIN)
-    return mmap(0, size, PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE, -1, 0);
+    buffer = static_cast<T*>(mmap(0, size, PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE, -1, 0));
+    return buffer != MAP_FAILED;
 #else
-    return fastMalloc(size);
+    buffer = static_cast<T*>(fastMalloc(size));
+    return !!buffer;
 #endif
 }
@@ -91 +94 @@
         newCapacity *= 2;
 
-    uint8_t* newBuffer = static_cast<uint8_t*>(allocBuffer(newCapacity));
-    if (!newBuffer)
+    uint8_t* newBuffer;
+    if (!allocBuffer(newBuffer, newCapacity))
         CRASH();
 

trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm

@@ -284 +284 @@
     char stackBuffer[inlineMessageMaxSize];
     char* buffer = &stackBuffer[0];
-    if (messageSize > inlineMessageMaxSize)
+    if (messageSize > inlineMessageMaxSize) {
         buffer = (char*)mmap(0, messageSize, PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE, -1, 0);
+        if (buffer == MAP_FAILED)
+            return false;
+    }
 
     bool isComplex = (numberOfPortDescriptors + numberOfOOLMemoryDescriptors > 0);