diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-11 20:53:54 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-11 20:53:54 +0000 |
| commit | a5d212cfee978920684ad90f4b9bb3cfb3eeee8a (patch) | |
| tree | 3396efd92d4b21310a91cdcf6cb147907add6550 | |
| parent | 67110b519a9c80e1bd9a7d6a45b91f1f478cee81 (diff) | |
| parent | 886419a51c28003ad27ff89a9fcd0a4b3230df81 (diff) | |
| download | frameworks_av-a5d212cfee978920684ad90f4b9bb3cfb3eeee8a.tar.gz frameworks_av-a5d212cfee978920684ad90f4b9bb3cfb3eeee8a.tar.bz2 frameworks_av-a5d212cfee978920684ad90f4b9bb3cfb3eeee8a.zip | |
BnCrypto: fix use-before-init in CREATE_PLUGIN am: 4bbfb6d881 am: a9296786e3 am: 245e44d9cf am: d8d4e80384 am: 886419a51c
Change-Id: Ia148a19a53973c1d962a4146031174951f211049
| -rw-r--r-- | drm/libmediadrm/ICrypto.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/drm/libmediadrm/ICrypto.cpp b/drm/libmediadrm/ICrypto.cpp index a2594aa2d8..8d8d0880b2 100644 --- a/drm/libmediadrm/ICrypto.cpp +++ b/drm/libmediadrm/ICrypto.cpp @@ -264,8 +264,12 @@ status_t BnCrypto::onTransact( { CHECK_INTERFACE(ICrypto, data, reply); - uint8_t uuid[16]; - data.read(uuid, sizeof(uuid)); + uint8_t uuid[16] = {0}; + if (data.read(uuid, sizeof(uuid)) != NO_ERROR) { + android_errorWriteLog(0x534e4554, "144767096"); + reply->writeInt32(BAD_VALUE); + return OK; + } size_t opaqueSize = data.readInt32(); void *opaqueData = NULL; @@ -280,7 +284,11 @@ status_t BnCrypto::onTransact( return NO_MEMORY; } - data.read(opaqueData, opaqueSize); + if (data.read(opaqueData, opaqueSize) != NO_ERROR) { + android_errorWriteLog(0x534e4554, "144767096"); + reply->writeInt32(BAD_VALUE); + return OK; + } reply->writeInt32(createPlugin(uuid, opaqueData, opaqueSize)); free(opaqueData); |