summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2021-09-28 05:58:57 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-09-28 05:58:57 +0000
commitc26006b1bc7339b454f589871fb16c312f9a83b5 (patch)
treecaf6e830c2242b05fb477fee0248b8f3c6700621
parent56294e27ce5cafa3963a7a4b14d9ea0c4617db9b (diff)
parentebe76514dbdd9a5edbf46e74be7745a8795e923b (diff)
Merge "libbinder: RPC - better error for malformed parcel" am: 76473a118d am: ebe76514db
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1838241 Change-Id: I3e8d01cbd7853c77c02d0e1558136803f5207019
-rw-r--r--libs/binder/RpcState.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/libs/binder/RpcState.cpp b/libs/binder/RpcState.cpp
index df935fe9e3..1e86104392 100644
--- a/libs/binder/RpcState.cpp
+++ b/libs/binder/RpcState.cpp
@@ -427,12 +427,16 @@ status_t RpcState::transact(const sp<RpcSession::RpcConnection>& connection,
const sp<IBinder>& binder, uint32_t code, const Parcel& data,
const sp<RpcSession>& session, Parcel* reply, uint32_t flags) {
if (!data.isForRpc()) {
- ALOGE("Refusing to send RPC with parcel not crafted for RPC");
+ ALOGE("Refusing to send RPC with parcel not crafted for RPC call on binder %p code "
+ "%" PRIu32,
+ binder.get(), code);
return BAD_TYPE;
}
if (data.objectsCount() != 0) {
- ALOGE("Parcel at %p has attached objects but is being used in an RPC call", &data);
+ ALOGE("Parcel at %p has attached objects but is being used in an RPC call on binder %p "
+ "code %" PRIu32,
+ &data, binder.get(), code);
return BAD_TYPE;
}