Fix potential decrypt src pointer overflow. am: c14f262876

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I58ba75466b6851265836a1db65654eb63f18c793
This commit is contained in:
Edwin Wong
2021-02-03 23:09:55 +00:00
committed by Automerger Merge Worker

View File

@@ -124,7 +124,11 @@ namespace implementation {
return Void();
}
if (source.offset + offset + source.size > sourceBase->getSize()) {
size_t totalSize = 0;
if (__builtin_add_overflow(source.offset, offset, &totalSize) ||
__builtin_add_overflow(totalSize, source.size, &totalSize) ||
totalSize > sourceBase->getSize()) {
android_errorWriteLog(0x534e4554, "176496160");
_hidl_cb(Status::ERROR_DRM_CANNOT_HANDLE, 0, "invalid buffer size");
return Void();
}