ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Return correct error code when finish input length is too long." am: 90657bbeab am: efea269a75

Browse source 
am: 18e3e2a66f

Change-Id: I40d235ba41cdb8a94d2955ed4dc77d94df72ed7b
This commit is contained in:
Jocelyn Bohr 2017-08-03 23:55:11 +00:00 • committed by android-build-merger
commit 67d5ddde7b
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
trusty/keymaster/trusty_keymaster_device.cpp
View file

@ -576,7 +576,9 @@ keymaster_error_t TrustyKeymasterDevice::finish(keymaster_operation_handle_t ope
return error_;
}
if (input && input->data_length > kMaximumFinishInputLength) {
return KM_ERROR_INVALID_ARGUMENT;
ALOGE("%zu-byte input to finish; only %zu bytes allowed",
input->data_length, kMaximumFinishInputLength);
return KM_ERROR_INVALID_INPUT_LENGTH;
}
if (out_params) {