Merge "libbinder Parcel: Fix ubsan error in readData" into main am: 1456474 am: a346e69

Treehugger Robot · android-build-merge-worker-robot · commit 5d649dcbf953 · 2024-10-10T04:34:48.000Z
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3300095 Change-Id: I6e1f739dff13309eeaab7ac6c950b827c7148aeb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/libs/binder/include/binder/Parcel.h b/libs/binder/include/binder/Parcel.h
@@ -1239,7 +1239,7 @@ class Parcel {
             if (__builtin_mul_overflow(size, sizeof(T), &dataLen)) {
                 return -EOVERFLOW;
             }
-            auto data = reinterpret_cast<const T*>(readInplace(dataLen));
+            auto data = readInplace(dataLen);
             if (data == nullptr) return BAD_VALUE;
             // std::vector::insert and similar methods will require type-dependent
             // byte alignment when inserting from a const iterator such as `data`,

Original file line number	Diff line number	Diff line change
`@@ -1239,7 +1239,7 @@ class Parcel {`
`1239`	`1239`	`if (__builtin_mul_overflow(size, sizeof(T), &dataLen)) {`
`1240`	`1240`	`return -EOVERFLOW;`
`1241`	`1241`	`}`
`1242`		`- auto data = reinterpret_cast<const T*>(readInplace(dataLen));`
	`1242`	`+ auto data = readInplace(dataLen);`
`1243`	`1243`	`if (data == nullptr) return BAD_VALUE;`
`1244`	`1244`	`// std::vector::insert and similar methods will require type-dependent`
`1245`	`1245`	// byte alignment when inserting from a const iterator such as `data`,