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

Commit 2a0f29f0 authored by Pawan Wagh's avatar Pawan Wagh Committed by Android (Google) Code Review
Browse files

Revert "Call set* functions while filling random parcel" 

This reverts commit aff7e0ad.

Reason for revert: Check if OOM in fuzzService test is caused due to this change - b/377685049

Change-Id: I97fe18044cb016ed7ed7f7272b95b137e157999a
parent aff7e0ad

libs/binder/tests/parcel_fuzzer/main.cpp

+1 −5
Original line number Diff line number Diff line
@@ -103,11 +103,7 @@ void doReadFuzz(const char* backend, const std::vector<ParcelRead<P>>& reads, 
    CHECK_LE(reads.size(), 255u) << reads.size();



    FUZZ_LOG() << "doReadFuzz backend: " << backend;



    if (p.data() != nullptr) {

    FUZZ_LOG() << "input: " << HexString(p.data(), p.dataSize());

    }



    FUZZ_LOG() << "instructions: " << HexString(instructions.data(), instructions.size());



    FuzzedDataProvider instructionsProvider(instructions.data(), instructions.size());

libs/binder/tests/parcel_fuzzer/random_parcel.cpp

+0 −24
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ void fillRandomParcel(Parcel* outputParcel, FuzzedDataProvider&& provider, 
    const bool resultShouldBeView = fuzzerParcelOptions & 1;

    const bool resultShouldBeRpc = fuzzerParcelOptions & 2;

    const bool resultShouldMarkSensitive = fuzzerParcelOptions & 4;

    const bool resultRandomSet = fuzzerParcelOptions & 8;



    auto sensitivity_guard = binder::impl::make_scope_guard([&]() {

        if (resultShouldMarkSensitive) {
@@ -88,12 +87,6 @@ void fillRandomParcel(Parcel* outputParcel, FuzzedDataProvider&& provider, 
        options->writeHeader(p, provider);

    }



    std::vector<uint8_t> instructionData;

    if (resultRandomSet) {

        size_t dataSize = provider.ConsumeIntegralInRange<size_t>(0, 100);

        instructionData = provider.ConsumeBytes<uint8_t>(dataSize);

    }



    while (provider.remaining_bytes() > 0) {

        auto fillFunc = provider.PickValueInArray<const std::function<void()>>({

                // write data
@@ -156,23 +149,6 @@ void fillRandomParcel(Parcel* outputParcel, FuzzedDataProvider&& provider, 


        fillFunc();

    }



    if (resultRandomSet) {

        auto value = 0;

        FuzzedDataProvider setInstructionsProvider(instructionData.data(), instructionData.size());

        while (setInstructionsProvider.remaining_bytes() > 0) {

            if (setInstructionsProvider.ConsumeBool()) {

                value = setInstructionsProvider.ConsumeIntegralInRange<size_t>(0, 2048);

            }

            auto setRandomValue =

                    setInstructionsProvider.PickValueInArray<const std::function<void()>>({

                            [&]() { p->setDataCapacity(value); },

                            [&]() { p->setDataPosition(value); },

                            [&]() { p->setDataSize(value); },

                    });

            setRandomValue();

        }

    }

}



} // namespace android