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

Commit 21796270 authored by Edwin Wong's avatar Edwin Wong Committed by Automerger Merge Worker
Browse files

Merge "Fix potential decrypt destPtr overflow." into rvc-dev am: fc62c64d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13467452

Change-Id: If4aacd71d59955f315174047dda61e4dbd1e7e9a
parents 229e07f9 fc62c64d

drm/1.0/default/CryptoPlugin.cpp

+6 −3
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ namespace implementation { 
            }

        }



        android::CryptoPlugin::Mode legacyMode;

        android::CryptoPlugin::Mode legacyMode = android::CryptoPlugin::kMode_Unencrypted;

        switch(mode) {

        case Mode::UNENCRYPTED:

            legacyMode = android::CryptoPlugin::kMode_Unencrypted;
@@ -146,7 +146,10 @@ namespace implementation { 
                return Void();

            }



            if (destBuffer.offset + destBuffer.size > destBase->getSize()) {

            size_t totalSize = 0;

            if (__builtin_add_overflow(destBuffer.offset, destBuffer.size, &totalSize) ||

                totalSize > destBase->getSize()) {

                android_errorWriteLog(0x534e4554, "176496353");

                _hidl_cb(Status::ERROR_DRM_CANNOT_HANDLE, 0, "invalid buffer size");

                return Void();

            }