tequilaOS/platform_system_security
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "keystore2 compat: stop crashing without hwservicemanager" into main am: a764eb9f45 am: d640b4c0ee am: 758bec0930

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

Change-Id: I48f75aa0ab4150cfeb65703bd1ef96df0a42a21d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Devin Moore 2023-09-06 19:47:01 +00:00 committed by Automerger Merge Worker
commit d7c817b718
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
keystore2/src/km_compat/km_compat.cpp
View file

@ -1450,7 +1450,12 @@ KeymasterDevices enumerateKeymasterDevices(IServiceManager* serviceManager) {
KeymasterDevices initializeKeymasters() { KeymasterDevices initializeKeymasters() {
auto serviceManager = IServiceManager::getService(); auto serviceManager = IServiceManager::getService();
CHECK(serviceManager.get()) << "Failed to get ServiceManager"; if (!serviceManager.get()) {
// New devices no longer have HIDL support, so failing to get hwservicemanager is
// expected behavior.
LOG(INFO) << "Skipping keymaster compat, this system is AIDL only.";
return KeymasterDevices();
}
auto result = enumerateKeymasterDevices<Keymaster4>(serviceManager.get()); auto result = enumerateKeymasterDevices<Keymaster4>(serviceManager.get());
auto softKeymaster = result[SecurityLevel::SOFTWARE]; auto softKeymaster = result[SecurityLevel::SOFTWARE];
if ((!result[SecurityLevel::TRUSTED_ENVIRONMENT]) && (!result[SecurityLevel::STRONGBOX])) { if ((!result[SecurityLevel::TRUSTED_ENVIRONMENT]) && (!result[SecurityLevel::STRONGBOX])) {