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

Commit 6ad2b727 authored by Edwin Wong's avatar Edwin Wong Committed by Android (Google) Code Review
Browse files

Merge "Fix potential decrypt destPtr overflow."

parents a6841bdc e55db240

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();

            }