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

Commit 6e786466 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "mediadrm_fuzzer set up AString poorly" into tm-dev am: bdb61e90 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/17144294

Change-Id: Ic50e7322da03aadf492bb3924e9e7f0b709af5a7
parents 424ab89f bdb61e90

drm/libmediadrm/CryptoHalAidl.cpp

+4 −2
Original line number Diff line number Diff line
@@ -353,7 +353,9 @@ ssize_t CryptoHalAidl::decrypt(const uint8_t keyId[16], const uint8_t iv[16], 


    err = statusAidlToStatusT(statusAidl);

    std::string msgStr(statusAidl.getMessage());

    if (errorDetailMsg != nullptr) {

        *errorDetailMsg = toString8(msgStr);

    }

    if (err != OK) {

        ALOGE("Failed on decrypt, error description:%s", statusAidl.getDescription().c_str());

        return err;

drm/libmediadrm/CryptoHalHidl.cpp

+6 −2
Original line number Diff line number Diff line
@@ -342,8 +342,10 @@ ssize_t CryptoHalHidl::decrypt(const uint8_t keyId[16], const uint8_t iv[16], 
                [&](Status_V1_2 status, uint32_t hBytesWritten, hidl_string hDetailedError) {

                    if (status == Status_V1_2::OK) {

                        bytesWritten = hBytesWritten;

                        if (errorDetailMsg != nullptr) {

                            *errorDetailMsg = toString8(hDetailedError);

                        }

                    }

                    err = toStatusT(status);

                });

    } else {
@@ -353,8 +355,10 @@ ssize_t CryptoHalHidl::decrypt(const uint8_t keyId[16], const uint8_t iv[16], 
                [&](Status status, uint32_t hBytesWritten, hidl_string hDetailedError) {

                    if (status == Status::OK) {

                        bytesWritten = hBytesWritten;

                        if (errorDetailMsg != nullptr) {

                            *errorDetailMsg = toString8(hDetailedError);

                        }

                    }

                    err = toStatusT(status);

                });

    }

drm/libmediadrm/fuzzer/mediadrm_fuzzer.cpp

+3 −2
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 


#include <binder/MemoryDealer.h>

#include <hidlmemory/FrameworkUtils.h>

#include <media/stagefright/foundation/AString.h>

#include <mediadrm/CryptoHal.h>

#include <mediadrm/DrmHal.h>

#include <utils/String8.h>
@@ -401,7 +402,7 @@ void DrmFuzzer::invokeCryptoDecrypt(const uint8_t *data) { 
        .secureMemory = nullptr};



    const uint64_t offset = 0;

    AString *errorDetailMsg = nullptr;

    AString errorDetailMsg;

    CryptoPlugin::Mode mode;

    bool shouldPassRandomCryptoMode = mFuzzedDataProvider->ConsumeBool();

    if (shouldPassRandomCryptoMode) {
@@ -411,7 +412,7 @@ void DrmFuzzer::invokeCryptoDecrypt(const uint8_t *data) { 
            kCryptoMode[mFuzzedDataProvider->ConsumeIntegralInRange<size_t>(0, kNumCryptoMode - 1)];

    }

    mCrypto->decrypt(keyId, iv, mode, pattern, sourceBuffer, offset, subSamples, numSubSamples,

                     destBuffer, errorDetailMsg);

                     destBuffer, &errorDetailMsg);



    if (heapSeqNum >= 0) {

        mCrypto->unsetHeap(heapSeqNum);