commit c5f7b62d695474e6ab9df9e26ffc26812ffdf44f
author Janis Danisevskis <jdanis@google.com> Tue Feb 15 14:01:57 2022 -0800
committer Janis Danisevskis <jdanis@google.com> Wed Mar 02 11:25:10 2022 -0800
tree da81f2a3947a41e361d0e3632c0d7aaa84ca875d
parent 1d08747a23515a1d0e3048a65d7b29f09dc0a213

Keystore 2.0: km_compat: Fix ref counting in software keymint device.

CreateKeyMintDevice now creates a shared_ptr with correct ref counts.

Bug: 219791936
Test: atest keystore2_km_compat_test_cpp does not crash any more.
Change-Id: I3b304c0a4d55883b8f917ce0ef4c70d4bd0e9e9b

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;
 }