commit 9bd8e8de0f90989f0cbc1ed1d6b78c78f5012aa0
author Treehugger Robot <treehugger-gerrit@google.com> Thu Mar 03 19:23:26 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Mar 03 19:23:26 2022 +0000
tree 87562ee0d8b47edfb944004f7c343ef690b9744e
parent d415f93994ee2739e9bed126c3f15d68144fcad3
parent 24e1a7791a3f09e18488eadaa09f34c672748d56

Merge "Keystore 2.0: km_compat: Fix ref counting in software keymint device." am: 99ad4f31c5 am: 62f2bd0e41 am: 24e1a7791a

Original change: https://android-review.googlesource.com/c/platform/system/security/+/2005060

Change-Id: Ia399c63202728a95f9d3b1b73c0d34feca5a7077

keystore2/src/km_compat/km_compat.cpp

diff --git a/keystore2/src/km_compat/km_compat.cpp b/keystore2/src/km_compat/km_compat.cpp
index 0775f2f..3db1a9f 100644
--- a/keystore2/src/km_compat/km_compat.cpp
+++ b/keystore2/src/km_compat/km_compat.cpp
@@ -1420,7 +1420,7 @@
         setNumFreeSlots(15);
     }
 
-    softKeyMintDevice_.reset(CreateKeyMintDevice(KeyMintSecurityLevel::SOFTWARE));
+    softKeyMintDevice_ = CreateKeyMintDevice(KeyMintSecurityLevel::SOFTWARE);
 }
 
 sp<Keymaster> getDevice(KeyMintSecurityLevel securityLevel) {
@@ -1448,7 +1448,7 @@
     static std::shared_ptr<IKeyMintDevice> swDevice;
     std::lock_guard<std::mutex> lock(mutex);
     if (!swDevice) {
-        swDevice.reset(CreateKeyMintDevice(KeyMintSecurityLevel::SOFTWARE));
+        swDevice = CreateKeyMintDevice(KeyMintSecurityLevel::SOFTWARE);
     }
     return swDevice;
 }