commit fd05934b20094432d7dbd60cbf8d1d1c6b3f3bb6
author Chad Brubaker <cbrubaker@google.com> Wed Sep 28 20:21:35 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Sep 28 20:21:35 2016 +0000
tree 8b09394bcb91326b9db68196c244e4654c7e4560
parent eb44d8146b8d1123699f75498b802ff7cac0f54f
parent 1156db460edb4334ee9d678070327163b1479312

Merge "keystore: fix memory leak from readKeymasterBlob" am: 3746fcf327
am: 1156db460e

Change-Id: I6d6aa111778048b93602a8edae50a2851190fbe0

keystore/IKeystoreService.cpp

diff --git a/keystore/IKeystoreService.cpp b/keystore/IKeystoreService.cpp
index 9217fae..6863a3c 100644
--- a/keystore/IKeystoreService.cpp
+++ b/keystore/IKeystoreService.cpp
@@ -1697,6 +1697,12 @@
             KeyCharacteristics outCharacteristics;
             int ret = getKeyCharacteristics(name, clientId.get(), appData.get(), uid,
                                             &outCharacteristics);
+            if (clientId.get() && clientId->data) {
+                free(const_cast<void*>(static_cast<const void*>(clientId->data)));
+            }
+            if (appData.get() && appData->data) {
+                free(const_cast<void*>(static_cast<const void*>(appData->data)));
+            }
             reply->writeNoException();
             reply->writeInt32(ret);
             reply->writeParcelable(outCharacteristics);
@@ -1732,6 +1738,12 @@
             int32_t uid = data.readInt32();
             ExportResult result;
             exportKey(name, format, clientId.get(), appData.get(), uid, &result);
+            if (clientId.get() && clientId->data) {
+                free(const_cast<void*>(static_cast<const void*>(clientId->data)));
+            }
+            if (appData.get() && appData->data) {
+                free(const_cast<void*>(static_cast<const void*>(appData->data)));
+            }
             reply->writeNoException();
             reply->writeParcelable(result);