commit f828fe4397c9853a53471a832a3e40919934f809
author Treehugger Robot <treehugger-gerrit@google.com> Wed Sep 01 02:05:51 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 01 02:05:51 2021 +0000
tree dc157c4ef98978f33972f11a2bddd11feae7b2e3
parent bca47a646669c56f6885fd3f5a0ff60ac1ce7dbe
parent a6318fd2985e03aa0540becfbf800be983460c04

Merge "native handle - fix ubsan abort"

Parcel.cpp

diff --git a/Parcel.cpp b/Parcel.cpp
index d95b0c3..6393bed 100644
--- a/Parcel.cpp
+++ b/Parcel.cpp
@@ -1464,8 +1464,8 @@
         return status;
     }
 
-    if (nativeHandleSize < sizeof(native_handle_t)) {
-        ALOGE("Received a native_handle_t size that was too small.");
+    if (nativeHandleSize < sizeof(native_handle_t) || nativeHandleSize > std::numeric_limits<uint32_t>::max()) {
+        ALOGE("Invalid native_handle_t size: %" PRIu64, nativeHandleSize);
         return BAD_VALUE;
     }