Merge "keystore: fix memory leak from readKeymasterBlob"

am: 3746fcf3

Change-Id: I1c35beb6f96bcf3a30fff7f8ab1f1eb18d3acb75

keystore/IKeystoreService.cpp

@@ -1697,6 +1697,12 @@ status_t BnKeystoreService::onTransact(
             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 @@ status_t BnKeystoreService::onTransact(
             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);