Merge "native handle - fix ubsan abort" am: f828fe4397temp_sam_202323961

Original change: https://android-review.googlesource.com/c/platform/system/libhwbinder/+/1815086

Change-Id: Ia961878214b0f572ff197f23ce4d30bffaddee0e

1 files changed, 2 insertions, 2 deletions

diff --git a/Parcel.cpp b/Parcel.cpp
index fdf481b..98300d0 100644
--- a/Parcel.cpp
+++ b/Parcel.cpp
@@ -1464,8 +1464,8 @@ status_t Parcel::readNullableNativeHandleNoDup(const native_handle_t **handle,
         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;
     }