summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJocelyn Bohr2017-08-03 18:55:11 -0500
committerandroid-build-merger2017-08-03 18:55:11 -0500
commit67d5ddde7b9837ff07f234b1736fcb881eddf8a5 (patch)
tree42e6c61891fdb927a7b289af0af6aeb1a29c89b1
parent7584fafc44c00ed7409c9a5c2eb035005623df95 (diff)
parent18e3e2a66f2304203042237ce903b561f3b3b895 (diff)
downloadplatform-system-core-67d5ddde7b9837ff07f234b1736fcb881eddf8a5.tar.gz
platform-system-core-67d5ddde7b9837ff07f234b1736fcb881eddf8a5.tar.xz
platform-system-core-67d5ddde7b9837ff07f234b1736fcb881eddf8a5.zip
Merge "Return correct error code when finish input length is too long." am: 90657bbeab am: efea269a75
am: 18e3e2a66f Change-Id: I40d235ba41cdb8a94d2955ed4dc77d94df72ed7b
-rw-r--r--trusty/keymaster/trusty_keymaster_device.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/trusty/keymaster/trusty_keymaster_device.cpp b/trusty/keymaster/trusty_keymaster_device.cpp
index 5f16fd0c0..cfe94cc6c 100644
--- a/trusty/keymaster/trusty_keymaster_device.cpp
+++ b/trusty/keymaster/trusty_keymaster_device.cpp
@@ -576,7 +576,9 @@ keymaster_error_t TrustyKeymasterDevice::finish(keymaster_operation_handle_t ope
576 return error_; 576 return error_;
577 } 577 }
578 if (input && input->data_length > kMaximumFinishInputLength) { 578 if (input && input->data_length > kMaximumFinishInputLength) {
579 return KM_ERROR_INVALID_ARGUMENT; 579 ALOGE("%zu-byte input to finish; only %zu bytes allowed",
580 input->data_length, kMaximumFinishInputLength);
581 return KM_ERROR_INVALID_INPUT_LENGTH;
580 } 582 }
581 583
582 if (out_params) { 584 if (out_params) {