diff options
| author | Jocelyn Bohr <bohr@google.com> | 2017-08-03 13:59:10 -0700 |
|---|---|---|
| committer | Jocelyn Bohr <bohr@google.com> | 2017-08-03 13:59:10 -0700 |
| commit | f1e5edf7656d5f1f577fa93a5878274b14aa0e84 (patch) | |
| tree | 267813502e138a06203435be88f6c57e1f660b2f /trusty/keymaster | |
| parent | ceb7814c8650c9dd1031ad6085d2ddb80914b6a9 (diff) | |
| download | system_core-f1e5edf7656d5f1f577fa93a5878274b14aa0e84.tar.gz system_core-f1e5edf7656d5f1f577fa93a5878274b14aa0e84.tar.bz2 system_core-f1e5edf7656d5f1f577fa93a5878274b14aa0e84.zip | |
Return correct error code when finish input length is too long.
Bug: 63745895
Change-Id: I465bf9138a0a21363f89f2c6074f7108ee33af70
Diffstat (limited to 'trusty/keymaster')
| -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) { |