Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 16:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correct the expection of DeviceInfo size

Browse Source 
Bug: 275645815
Test: VtsHalRemotelyProvisionedComponentTargetTest
Change-Id: I24187be5b7b34285aa53ddaa420b871826a3b825
This commit is contained in:
Tommy Chiu
2023-03-29 07:11:23 +00:00
parent a4ccb03efd
commit 72abbbd36d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
security/keymint/support/remote_prov_utils.cpp
View File

@@ -467,16 +467,16 @@ ErrMsgOr<std::unique_ptr<cppbor::Map>> parseAndValidateDeviceInfo(
case 3: case 3:
if (isTeeDeviceInfo(*parsed) && parsed->size() != kNumTeeDeviceInfoEntries) { if (isTeeDeviceInfo(*parsed) && parsed->size() != kNumTeeDeviceInfoEntries) {
error += fmt::format( error += fmt::format(
"Err: Incorrect number of device info entries. Expected {} but got" "Err: Incorrect number of device info entries. Expected {} but got "
"{}\n", "{}\n",
kNumTeeDeviceInfoEntries, parsed->size()); kNumTeeDeviceInfoEntries, parsed->size());
} }
// TEE IRPC instances require all entries to be present in DeviceInfo. Non-TEE instances // TEE IRPC instances require all entries to be present in DeviceInfo. Non-TEE instances
// may omit `os_version` // may omit `os_version`
if (!isTeeDeviceInfo(*parsed) && (parsed->size() != kNumTeeDeviceInfoEntries || if (!isTeeDeviceInfo(*parsed) && (parsed->size() != kNumTeeDeviceInfoEntries &&
parsed->size() != kNumTeeDeviceInfoEntries - 1)) { parsed->size() != kNumTeeDeviceInfoEntries - 1)) {
error += fmt::format( error += fmt::format(
"Err: Incorrect number of device info entries. Expected {} or {} but got" "Err: Incorrect number of device info entries. Expected {} or {} but got "
"{}\n", "{}\n",
kNumTeeDeviceInfoEntries - 1, kNumTeeDeviceInfoEntries, parsed->size()); kNumTeeDeviceInfoEntries - 1, kNumTeeDeviceInfoEntries, parsed->size());
} }