diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-05 23:52:31 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-05 23:52:31 +0000 |
| commit | f0791037c1676ecb6a4af39acabf33db02982545 (patch) | |
| tree | a3ad8bf44e83cb5090efe266fba8725836cbf115 /drm | |
| parent | 6cf42dbae74a1237cf8861888f990280abbd6ef5 (diff) | |
| parent | aca92198a127bb8a7d2e0ba9edcb52954bffcc24 (diff) | |
| download | frameworks_av-f0791037c1676ecb6a4af39acabf33db02982545.tar.gz frameworks_av-f0791037c1676ecb6a4af39acabf33db02982545.tar.bz2 frameworks_av-f0791037c1676ecb6a4af39acabf33db02982545.zip | |
BnCrypto: fix use-before-init in CREATE_PLUGIN am: 51aa200376 am: aca92198a1
Change-Id: I19571d507f1234ece0d63542688063f087cf6bd7
Diffstat (limited to 'drm')
| -rw-r--r-- | drm/libmediadrm/ICrypto.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/drm/libmediadrm/ICrypto.cpp b/drm/libmediadrm/ICrypto.cpp index ee5ea936c4..fe94044875 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; @@ -281,6 +285,11 @@ status_t BnCrypto::onTransact( } 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); |