Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2e8a8ea authored by Steven Moreland's avatar Steven Moreland
Browse files

binder_parcel_fuzzer: enable c++ vector tests 

Many of these have had a heuristic in place to avoid overallocation, so
they don't need to be disabled.

Bug: 131868573
Test: run fuzzer for a few minutes
Change-Id: I66efe42b92913815dc4bb0b02edddf44b75ce3f3
parent c3229abc

libs/binder/tests/parcel_fuzzer/binder.cpp

+51 −56
Original line number Diff line number Diff line
@@ -158,22 +158,20 @@ std::vector<ParcelRead<::android::Parcel>> BINDER_PARCEL_READ_FUNCTIONS { 
    PARCEL_READ_WITH_STATUS(android::sp<android::IBinder>, readStrongBinder),

    PARCEL_READ_WITH_STATUS(android::sp<android::IBinder>, readNullableStrongBinder),



    // TODO(b/131868573): can force read of arbitrarily sized vector

    // PARCEL_READ_WITH_STATUS(std::vector<ByteEnum>, readEnumVector),

    // PARCEL_READ_WITH_STATUS(std::unique_ptr<std::vector<ByteEnum>>, readEnumVector),

    // PARCEL_READ_WITH_STATUS(std::optional<std::vector<ByteEnum>>, readEnumVector),

    // PARCEL_READ_WITH_STATUS(std::vector<IntEnum>, readEnumVector),

    // PARCEL_READ_WITH_STATUS(std::unique_ptr<std::vector<IntEnum>>, readEnumVector),

    // PARCEL_READ_WITH_STATUS(std::optional<std::vector<IntEnum>>, readEnumVector),

    // PARCEL_READ_WITH_STATUS(std::vector<LongEnum>, readEnumVector),

    // PARCEL_READ_WITH_STATUS(std::unique_ptr<std::vector<LongEnum>>, readEnumVector),

    // PARCEL_READ_WITH_STATUS(std::optional<std::vector<LongEnum>>, readEnumVector),

    PARCEL_READ_WITH_STATUS(std::vector<ByteEnum>, readEnumVector),

    PARCEL_READ_WITH_STATUS(std::unique_ptr<std::vector<ByteEnum>>, readEnumVector),

    PARCEL_READ_WITH_STATUS(std::optional<std::vector<ByteEnum>>, readEnumVector),

    PARCEL_READ_WITH_STATUS(std::vector<IntEnum>, readEnumVector),

    PARCEL_READ_WITH_STATUS(std::unique_ptr<std::vector<IntEnum>>, readEnumVector),

    PARCEL_READ_WITH_STATUS(std::optional<std::vector<IntEnum>>, readEnumVector),

    PARCEL_READ_WITH_STATUS(std::vector<LongEnum>, readEnumVector),

    PARCEL_READ_WITH_STATUS(std::unique_ptr<std::vector<LongEnum>>, readEnumVector),

    PARCEL_READ_WITH_STATUS(std::optional<std::vector<LongEnum>>, readEnumVector),



    // only reading one parcelable type for now

    // TODO(b/131868573): can force read of arbitrarily sized vector

    // PARCEL_READ_WITH_STATUS(std::unique_ptr<std::vector<std::unique_ptr<ExampleParcelable>>>, readParcelableVector),

    // PARCEL_READ_WITH_STATUS(std::optional<std::vector<std::optional<ExampleParcelable>>>, readParcelableVector),

    // PARCEL_READ_WITH_STATUS(std::vector<ExampleParcelable>, readParcelableVector),

    PARCEL_READ_WITH_STATUS(std::unique_ptr<std::vector<std::unique_ptr<ExampleParcelable>>>, readParcelableVector),

    PARCEL_READ_WITH_STATUS(std::optional<std::vector<std::optional<ExampleParcelable>>>, readParcelableVector),

    PARCEL_READ_WITH_STATUS(std::vector<ExampleParcelable>, readParcelableVector),

    PARCEL_READ_WITH_STATUS(ExampleParcelable, readParcelable),

    PARCEL_READ_WITH_STATUS(std::unique_ptr<ExampleParcelable>, readParcelable),

    PARCEL_READ_WITH_STATUS(std::optional<ExampleParcelable>, readParcelable),
@@ -182,45 +180,43 @@ std::vector<ParcelRead<::android::Parcel>> BINDER_PARCEL_READ_FUNCTIONS { 
    PARCEL_READ_WITH_STATUS(android::sp<android::os::IServiceManager>, readStrongBinder),

    PARCEL_READ_WITH_STATUS(android::sp<android::os::IServiceManager>, readNullableStrongBinder),



    // TODO(b/131868573): can force read of arbitrarily sized vector

    // PARCEL_READ_WITH_STATUS(::std::unique_ptr<std::vector<android::sp<android::IBinder>>>, readStrongBinderVector),

    // PARCEL_READ_WITH_STATUS(::std::optional<std::vector<android::sp<android::IBinder>>>, readStrongBinderVector),

    // PARCEL_READ_WITH_STATUS(std::vector<android::sp<android::IBinder>>, readStrongBinderVector),

    PARCEL_READ_WITH_STATUS(::std::unique_ptr<std::vector<android::sp<android::IBinder>>>, readStrongBinderVector),

    PARCEL_READ_WITH_STATUS(::std::optional<std::vector<android::sp<android::IBinder>>>, readStrongBinderVector),

    PARCEL_READ_WITH_STATUS(std::vector<android::sp<android::IBinder>>, readStrongBinderVector),



    // TODO(b/131868573): can force read of arbitrarily sized vector

    // PARCEL_READ_WITH_STATUS(std::unique_ptr<std::vector<int8_t>>, readByteVector),

    // PARCEL_READ_WITH_STATUS(std::optional<std::vector<int8_t>>, readByteVector),

    // PARCEL_READ_WITH_STATUS(std::vector<int8_t>, readByteVector),

    // PARCEL_READ_WITH_STATUS(std::unique_ptr<std::vector<uint8_t>>, readByteVector),

    // PARCEL_READ_WITH_STATUS(std::optional<std::vector<uint8_t>>, readByteVector),

    // PARCEL_READ_WITH_STATUS(std::vector<uint8_t>, readByteVector),

    // PARCEL_READ_WITH_STATUS(std::unique_ptr<std::vector<int32_t>>, readInt32Vector),

    // PARCEL_READ_WITH_STATUS(std::optional<std::vector<int32_t>>, readInt32Vector),

    // PARCEL_READ_WITH_STATUS(std::vector<int32_t>, readInt32Vector),

    // PARCEL_READ_WITH_STATUS(std::unique_ptr<std::vector<int64_t>>, readInt64Vector),

    // PARCEL_READ_WITH_STATUS(std::optional<std::vector<int64_t>>, readInt64Vector),

    // PARCEL_READ_WITH_STATUS(std::vector<int64_t>, readInt64Vector),

    // PARCEL_READ_WITH_STATUS(std::unique_ptr<std::vector<uint64_t>>, readUint64Vector),

    // PARCEL_READ_WITH_STATUS(std::optional<std::vector<uint64_t>>, readUint64Vector),

    // PARCEL_READ_WITH_STATUS(std::vector<uint64_t>, readUint64Vector),

    // PARCEL_READ_WITH_STATUS(std::unique_ptr<std::vector<float>>, readFloatVector),

    // PARCEL_READ_WITH_STATUS(std::optional<std::vector<float>>, readFloatVector),

    // PARCEL_READ_WITH_STATUS(std::vector<float>, readFloatVector),

    // PARCEL_READ_WITH_STATUS(std::unique_ptr<std::vector<double>>, readDoubleVector),

    // PARCEL_READ_WITH_STATUS(std::optional<std::vector<double>>, readDoubleVector),

    // PARCEL_READ_WITH_STATUS(std::vector<double>, readDoubleVector),

    // PARCEL_READ_WITH_STATUS(std::unique_ptr<std::vector<bool>>, readBoolVector),

    // PARCEL_READ_WITH_STATUS(std::optional<std::vector<bool>>, readBoolVector),

    // PARCEL_READ_WITH_STATUS(std::vector<bool>, readBoolVector),

    // PARCEL_READ_WITH_STATUS(std::unique_ptr<std::vector<char16_t>>, readCharVector),

    // PARCEL_READ_WITH_STATUS(std::optional<std::vector<char16_t>>, readCharVector),

    // PARCEL_READ_WITH_STATUS(std::vector<char16_t>, readCharVector),

    // PARCEL_READ_WITH_STATUS(std::unique_ptr<std::vector<std::unique_ptr<android::String16>>>, readString16Vector),

    // PARCEL_READ_WITH_STATUS(std::optional<std::vector<std::optional<android::String16>>>, readString16Vector),

    // PARCEL_READ_WITH_STATUS(std::vector<android::String16>, readString16Vector),

    // PARCEL_READ_WITH_STATUS(std::unique_ptr<std::vector<std::unique_ptr<std::string>>>, readUtf8VectorFromUtf16Vector),

    // PARCEL_READ_WITH_STATUS(std::optional<std::vector<std::optional<std::string>>>, readUtf8VectorFromUtf16Vector),

    // PARCEL_READ_WITH_STATUS(std::vector<std::string>, readUtf8VectorFromUtf16Vector),

    PARCEL_READ_WITH_STATUS(std::unique_ptr<std::vector<int8_t>>, readByteVector),

    PARCEL_READ_WITH_STATUS(std::optional<std::vector<int8_t>>, readByteVector),

    PARCEL_READ_WITH_STATUS(std::vector<int8_t>, readByteVector),

    PARCEL_READ_WITH_STATUS(std::unique_ptr<std::vector<uint8_t>>, readByteVector),

    PARCEL_READ_WITH_STATUS(std::optional<std::vector<uint8_t>>, readByteVector),

    PARCEL_READ_WITH_STATUS(std::vector<uint8_t>, readByteVector),

    PARCEL_READ_WITH_STATUS(std::unique_ptr<std::vector<int32_t>>, readInt32Vector),

    PARCEL_READ_WITH_STATUS(std::optional<std::vector<int32_t>>, readInt32Vector),

    PARCEL_READ_WITH_STATUS(std::vector<int32_t>, readInt32Vector),

    PARCEL_READ_WITH_STATUS(std::unique_ptr<std::vector<int64_t>>, readInt64Vector),

    PARCEL_READ_WITH_STATUS(std::optional<std::vector<int64_t>>, readInt64Vector),

    PARCEL_READ_WITH_STATUS(std::vector<int64_t>, readInt64Vector),

    PARCEL_READ_WITH_STATUS(std::unique_ptr<std::vector<uint64_t>>, readUint64Vector),

    PARCEL_READ_WITH_STATUS(std::optional<std::vector<uint64_t>>, readUint64Vector),

    PARCEL_READ_WITH_STATUS(std::vector<uint64_t>, readUint64Vector),

    PARCEL_READ_WITH_STATUS(std::unique_ptr<std::vector<float>>, readFloatVector),

    PARCEL_READ_WITH_STATUS(std::optional<std::vector<float>>, readFloatVector),

    PARCEL_READ_WITH_STATUS(std::vector<float>, readFloatVector),

    PARCEL_READ_WITH_STATUS(std::unique_ptr<std::vector<double>>, readDoubleVector),

    PARCEL_READ_WITH_STATUS(std::optional<std::vector<double>>, readDoubleVector),

    PARCEL_READ_WITH_STATUS(std::vector<double>, readDoubleVector),

    PARCEL_READ_WITH_STATUS(std::unique_ptr<std::vector<bool>>, readBoolVector),

    PARCEL_READ_WITH_STATUS(std::optional<std::vector<bool>>, readBoolVector),

    PARCEL_READ_WITH_STATUS(std::vector<bool>, readBoolVector),

    PARCEL_READ_WITH_STATUS(std::unique_ptr<std::vector<char16_t>>, readCharVector),

    PARCEL_READ_WITH_STATUS(std::optional<std::vector<char16_t>>, readCharVector),

    PARCEL_READ_WITH_STATUS(std::vector<char16_t>, readCharVector),

    PARCEL_READ_WITH_STATUS(std::unique_ptr<std::vector<std::unique_ptr<android::String16>>>, readString16Vector),

    PARCEL_READ_WITH_STATUS(std::optional<std::vector<std::optional<android::String16>>>, readString16Vector),

    PARCEL_READ_WITH_STATUS(std::vector<android::String16>, readString16Vector),

    PARCEL_READ_WITH_STATUS(std::unique_ptr<std::vector<std::unique_ptr<std::string>>>, readUtf8VectorFromUtf16Vector),

    PARCEL_READ_WITH_STATUS(std::optional<std::vector<std::optional<std::string>>>, readUtf8VectorFromUtf16Vector),

    PARCEL_READ_WITH_STATUS(std::vector<std::string>, readUtf8VectorFromUtf16Vector),



    [] (const android::Parcel& p, uint8_t /*len*/) {

        FUZZ_LOG() << "about to read flattenable";
@@ -254,10 +250,9 @@ std::vector<ParcelRead<::android::Parcel>> BINDER_PARCEL_READ_FUNCTIONS { 
    PARCEL_READ_NO_STATUS(int, readParcelFileDescriptor),

    PARCEL_READ_WITH_STATUS(android::base::unique_fd, readUniqueFileDescriptor),



    // TODO(b/131868573): can force read of arbitrarily sized vector

    // PARCEL_READ_WITH_STATUS(std::unique_ptr<std::vector<android::base::unique_fd>>, readUniqueFileDescriptorVector),

    // PARCEL_READ_WITH_STATUS(std::optional<std::vector<android::base::unique_fd>>, readUniqueFileDescriptorVector),

    // PARCEL_READ_WITH_STATUS(std::vector<android::base::unique_fd>, readUniqueFileDescriptorVector),

    PARCEL_READ_WITH_STATUS(std::unique_ptr<std::vector<android::base::unique_fd>>, readUniqueFileDescriptorVector),

    PARCEL_READ_WITH_STATUS(std::optional<std::vector<android::base::unique_fd>>, readUniqueFileDescriptorVector),

    PARCEL_READ_WITH_STATUS(std::vector<android::base::unique_fd>, readUniqueFileDescriptorVector),



    [] (const android::Parcel& p, uint8_t len) {

        FUZZ_LOG() << "about to readBlob";