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

Commit c99bf00d 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 am: b47d5de0 

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

Change-Id: I5de5d9fd55c518b88c4eb7655bbd24e58c7c2f16
parents 42d9f3f3 b47d5de0

drm/1.0/default/CryptoPlugin.cpp

+5 −2
Original line number Diff line number Diff line
@@ -148,7 +148,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();

            }