diff options
| author | Jocelyn Bohr <bohr@google.com> | 2017-08-03 23:55:11 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-08-03 23:55:11 +0000 |
| commit | 67d5ddde7b9837ff07f234b1736fcb881eddf8a5 (patch) | |
| tree | 42e6c61891fdb927a7b289af0af6aeb1a29c89b1 /trusty | |
| parent | 7584fafc44c00ed7409c9a5c2eb035005623df95 (diff) | |
| parent | 18e3e2a66f2304203042237ce903b561f3b3b895 (diff) | |
| download | system_core-67d5ddde7b9837ff07f234b1736fcb881eddf8a5.tar.gz system_core-67d5ddde7b9837ff07f234b1736fcb881eddf8a5.tar.bz2 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
Diffstat (limited to 'trusty')
| -rw-r--r-- | trusty/keymaster/trusty_keymaster_device.cpp | 4 |
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 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) { |