commit 4d52c4bf9e6603ef3d589f25dafc7a1bc9c55835
author Chong Zhang <chz@google.com> Thu Feb 27 10:20:17 2020 -0800
committer Anis Assi <anisassi@google.com> Thu Mar 12 13:37:22 2020 -0700
tree 19048186cdc9d3576ab122ab21a29e7d601c935c
parent 6a8369b4a1f3be1d2c7004d6d50aaf3932ec0034

[DO NOT MERGE] Fix uninitialized data in IHDCP decrypt

bug: 150156584
test: build
Change-Id: Ia4ab8e4b4db0b895d0ca36592c0469adb3b89aac
(cherry picked from commit 58af3de44d17e6ba716178e147474a20765c1441)

media/libmedia/IHDCP.cpp

diff --git a/media/libmedia/IHDCP.cpp b/media/libmedia/IHDCP.cpp
index a46017f..c608175 100644
--- a/media/libmedia/IHDCP.cpp
+++ b/media/libmedia/IHDCP.cpp
@@ -333,11 +333,12 @@
 
             void *outData = (uint8_t *)inData + size;
 
-            data.read(inData, size);
-
-            uint32_t streamCTR = data.readInt32();
-            uint64_t inputCTR = data.readInt64();
-            status_t err = decrypt(inData, size, streamCTR, inputCTR, outData);
+            status_t err = data.read(inData, size);
+            if (err == OK) {
+                uint32_t streamCTR = data.readInt32();
+                uint64_t inputCTR = data.readInt64();
+                err = decrypt(inData, size, streamCTR, inputCTR, outData);
+            }
 
             reply->writeInt32(err);