diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-06 00:05:15 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-06 00:05:15 +0000 |
| commit | df156dc766918c12b1931eb79919b4db3c959b1a (patch) | |
| tree | e7d769ee251bd8503fd9c23de72b5d65ba55bfd2 | |
| parent | d651cdcfafd48df0ae0f50f83eb85a35ee5ab0cb (diff) | |
| parent | f0791037c1676ecb6a4af39acabf33db02982545 (diff) | |
| download | frameworks_av-df156dc766918c12b1931eb79919b4db3c959b1a.tar.gz frameworks_av-df156dc766918c12b1931eb79919b4db3c959b1a.tar.bz2 frameworks_av-df156dc766918c12b1931eb79919b4db3c959b1a.zip | |
BnCrypto: fix use-before-init in CREATE_PLUGIN am: 51aa200376 am: aca92198a1 am: f0791037c1
Change-Id: Iabb65b41883e0b46a7c0ea2e1a98accba1377eae
| -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 a2594aa2d8..4707593b27 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); |