commit 1d66f1aabb5f9628290f5f4fb8578a327127a472
author Treehugger Robot <treehugger-gerrit@google.com> Fri Oct 23 21:54:51 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 23 21:54:51 2020 +0000
tree 94162fe083d79c91a90d7041a0f8dc8659498b7b
parent 049abe0406fcf0ab9f27d6e80e89222e29874a23
parent 169f11361c2a52e4af7e7fd0ba419cc5212fa704

Merge changes I51a58e57,Ibdf8c2c5,I0b1e9221,Ie2a62c5a,Ic7fab603, ...

* changes:
  GPU Memory: add errno to error log messages
  GPU Memory: update unittest to reduce flakiness
  GpuMem: refactor and add unittest for traverseGpuMemTotals
  GpuMemTracer: remove the sleep workaround
  GPU Memory: remove an infeasible TODO
  GpuMem perfetto producer
  GPU Memory: ensure bpf program is attached to the tracepoint
  GpuMem: fix flaky unittests on cuttlefish platform
  GPU Memory: add unittests for libgpumem
  GPU Memory: install gpu_mem.o and integrate libgpumem
  GPU Memory: implement libgpumem to interact with bpf
  GPU Memory: add bpf c program for gpu_mem/gpu_mem_total tracepoint

libs/binder/parcel_fuzzer/binder_ndk.cpp

diff --git a/libs/binder/parcel_fuzzer/binder_ndk.cpp b/libs/binder/parcel_fuzzer/binder_ndk.cpp
index 29da8f7..008780c 100644
--- a/libs/binder/parcel_fuzzer/binder_ndk.cpp
+++ b/libs/binder/parcel_fuzzer/binder_ndk.cpp
@@ -18,6 +18,7 @@
 #include "binder_ndk.h"
 
 #include <android/binder_parcel_utils.h>
+#include <android/binder_parcelable_utils.h>
 
 #include "util.h"
 
@@ -54,6 +55,25 @@
             binder_status_t status = AParcel_readStatusHeader(p.aParcel(), t.getR());
             FUZZ_LOG() << "read status header: " << status;
         },
+        [](const NdkParcelAdapter& p, uint8_t /*data*/) {
+            FUZZ_LOG() << "about to getDataSize the parcel";
+            AParcel_getDataSize(p.aParcel());
+            FUZZ_LOG() << "getDataSize done";
+        },
+        [](const NdkParcelAdapter& p, uint8_t data) {
+            FUZZ_LOG() << "about to read a ParcelableHolder";
+            ndk::AParcelableHolder ph {(data % 2 == 1) ? ndk::STABILITY_LOCAL : ndk::STABILITY_VINTF};
+            binder_status_t status = AParcel_readParcelable(p.aParcel(), &ph);
+            FUZZ_LOG() << "read the ParcelableHolder: " << status;
+        },
+        [](const NdkParcelAdapter& p, uint8_t data) {
+            FUZZ_LOG() << "about to appendFrom";
+            AParcel* parcel = AParcel_create();
+            binder_status_t status = AParcel_appendFrom(p.aParcel(), parcel, 0, data);
+            AParcel_delete(parcel);
+            FUZZ_LOG() << "appendFrom: " << status;
+        },
+
         PARCEL_READ(int32_t, AParcel_readInt32),
         PARCEL_READ(uint32_t, AParcel_readUint32),
         PARCEL_READ(int64_t, AParcel_readInt64),