Title: [282514] releases/WebKitGTK/webkit-2.32/Source/WebKit
Revision
282514
Author
[email protected]
Date
2021-09-16 02:07:12 -0700 (Thu, 16 Sep 2021)

Log Message

Merge r276651 - [IPC Hardening] Make sure IPC::Decoder constructors consistently call markInvalid() when decoding fails
https://bugs.webkit.org/show_bug.cgi?id=225110
<rdar://76547775>

Reviewed by Darin Adler.

One of the IPC::Decoder constructors was failing to call markInvalid() after failing to
decoder the message name.

* Platform/IPC/Decoder.cpp:
(IPC::m_destinationID):

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.32/Source/WebKit/ChangeLog (282513 => 282514)


--- releases/WebKitGTK/webkit-2.32/Source/WebKit/ChangeLog	2021-09-16 08:56:57 UTC (rev 282513)
+++ releases/WebKitGTK/webkit-2.32/Source/WebKit/ChangeLog	2021-09-16 09:07:12 UTC (rev 282514)
@@ -1,3 +1,17 @@
+2021-04-27  Chris Dumez  <[email protected]>
+
+        [IPC Hardening] Make sure IPC::Decoder constructors consistently call markInvalid() when decoding fails
+        https://bugs.webkit.org/show_bug.cgi?id=225110
+        <rdar://76547775>
+
+        Reviewed by Darin Adler.
+
+        One of the IPC::Decoder constructors was failing to call markInvalid() after failing to
+        decoder the message name.
+
+        * Platform/IPC/Decoder.cpp:
+        (IPC::m_destinationID):
+
 2021-04-26  Tim Nguyen  <[email protected]>
 
         Add more eager OOB checks when creating DisplayListReaderHandle & DisplayListWriterHandle.

Modified: releases/WebKitGTK/webkit-2.32/Source/WebKit/Platform/IPC/Decoder.cpp (282513 => 282514)


--- releases/WebKitGTK/webkit-2.32/Source/WebKit/Platform/IPC/Decoder.cpp	2021-09-16 08:56:57 UTC (rev 282513)
+++ releases/WebKitGTK/webkit-2.32/Source/WebKit/Platform/IPC/Decoder.cpp	2021-09-16 09:07:12 UTC (rev 282514)
@@ -117,8 +117,10 @@
     , m_bufferDeallocator([] (const uint8_t*, size_t) { })
     , m_destinationID(destinationID)
 {
-    if (!decode(m_messageName))
+    if (!decode(m_messageName)) {
+        markInvalid();
         return;
+    }
 }
 
 Decoder::~Decoder()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to