widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[RESTRICT AUTOMERGE] Fix potential decrypt destPtr overflow. am: 68b5b00567

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14238895

Change-Id: I3078fc60223d3cfc7454deddbec3bbbd83cc155e
This commit is contained in:
Edwin Wong
2021-04-21 23:49:55 +00:00
committed by Automerger Merge Worker
parent b8c670a32f 68b5b00567
commit deece4f746
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libwvdrmengine/mediacrypto/src_hidl/WVCryptoPlugin.cpp
View File

@@ -233,7 +233,10 @@ Return<void> WVCryptoPlugin::decrypt_1_2(
return Void(); return Void();
} }
if (destBuffer.offset + destBuffer.size > destBase->getSize()) { size_t totalDstSize = 0;
if (__builtin_add_overflow(destBuffer.offset, destBuffer.size, &totalDstSize) ||
totalDstSize > destBase->getSize()) {
android_errorWriteLog(0x534e4554, "176444622");
_hidl_cb(Status_V1_2::ERROR_DRM_FRAME_TOO_LARGE, 0, "invalid buffer size"); _hidl_cb(Status_V1_2::ERROR_DRM_FRAME_TOO_LARGE, 0, "invalid buffer size");
return Void(); return Void();
} }