commit 3b685aa34bc16feec26a5f0cdfcd64f01c8cf4cc
author Steven Moreland <smoreland@google.com> Wed Oct 02 18:37:18 2024 +0000
committer Steven Moreland <smoreland@google.com> Wed Oct 02 18:38:10 2024 +0000
tree 5c204424eac043a00fd0091a9e24edc0910e482b
parent ff7e4543c2a715cf0931f8bf95bbaaf6a6ad221e

libbinder: better object logs

Separate patch, b/c won't be backported

Bug: 370840874
Test: N/A
Ignore-AOSP-First: security related
Change-Id: Iefc49398bab70e7255346dd4a0375b11edc1c159

libs/binder/Parcel.cpp

diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp
index 3711362..734b4b6 100644
--- a/libs/binder/Parcel.cpp
+++ b/libs/binder/Parcel.cpp
@@ -180,7 +180,7 @@
         }
     }
 
-    ALOGD("Invalid object type 0x%08x", obj.hdr.type);
+    ALOGE("Invalid object type 0x%08x to acquire", obj.hdr.type);
 }
 
 static void release_object(const sp<ProcessState>& proc, const flat_binder_object& obj,
@@ -210,7 +210,7 @@
         }
     }
 
-    ALOGE("Invalid object type 0x%08x", obj.hdr.type);
+    ALOGE("Invalid object type 0x%08x to release", obj.hdr.type);
 }
 #endif // BINDER_WITH_KERNEL_IPC
 
@@ -1874,7 +1874,10 @@
                 if (mDataPos < kernelFields->mObjects[nextObject] + sizeof(flat_binder_object)) {
                     // Requested info overlaps with an object
                     if (!mServiceFuzzing) {
-                        ALOGE("Attempt to read from protected data in Parcel %p", this);
+                        ALOGE("Attempt to read or write from protected data in Parcel %p. pos: "
+                              "%zu, nextObject: %zu, object offset: %llu, object size: %zu",
+                              this, mDataPos, nextObject, kernelFields->mObjects[nextObject],
+                              sizeof(flat_binder_object));
                     }
                     return PERMISSION_DENIED;
                 }