Changeset 280836 in webkit

Timestamp:

Aug 10, 2021, 2:29:58 AM (5 years ago)

Author:

Adrian Perez de Castro

Message:

Merge r274153 - [IPC Hardening] Protect WebPageProxy::willSubmitForm() against bad Strings
​https://bugs.webkit.org/show_bug.cgi?id=222955
<rdar://problem/75195062>

Reviewed by Anders Carlsson.

The Strings passed in textFieldValues are used as keys in a HashMap later on so we need
to validate them.

• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::willSubmitForm):

Location:

releases/WebKitGTK/webkit-2.32/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebPageProxy.cpp (modified) (2 diffs)

releases/WebKitGTK/webkit-2.32/Source/WebKit/ChangeLog

@@ +1 @@
+2021-03-09  Chris Dumez  <cdumez@apple.com>
+
+        [IPC Hardening] Protect WebPageProxy::willSubmitForm() against bad Strings
+        https://bugs.webkit.org/show_bug.cgi?id=222955
+        <rdar://problem/75195062>
+
+        Reviewed by Anders Carlsson.
+
+        The Strings passed in textFieldValues are used as keys in a HashMap later on so we need
+        to validate them.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::willSubmitForm):
+
 2021-03-05  Chris Dumez  <cdumez@apple.com>
 

releases/WebKitGTK/webkit-2.32/Source/WebKit/UIProcess/WebPageProxy.cpp

@@ -32 +32 @@
 #include "APIContentWorld.h"
 #include "APIContextMenuClient.h"
+#include "APIDictionary.h"
 #include "APIFindClient.h"
 #include "APIFindMatchesClient.h"
@@ -5446 +5447 @@
     MESSAGE_CHECK(m_process, sourceFrame);
 
+    for (auto& pair : textFieldValues)
+        MESSAGE_CHECK(m_process, API::Dictionary::MapType::isValidKey(pair.first));
+
     m_formClient->willSubmitForm(*this, *frame, *sourceFrame, textFieldValues, m_process->transformHandlesToObjects(userData.object()).get(), [this, protectedThis = makeRef(*this), frameID, listenerID]() {
         send(Messages::WebPage::ContinueWillSubmitForm(frameID, listenerID));