commit a5846d30f0010a55bad615a9ad1f39ed0a7af74a
author Jocelyn Bohr <bohr@google.com> Thu Aug 03 13:59:10 2017 -0700
committer Jocelyn Bohr <bohr@google.com> Thu Aug 03 13:59:10 2017 -0700
tree 267813502e138a06203435be88f6c57e1f660b2f
parent 57e76fbf4a69010d7e3e0ae3a3d85cd6c556fa4e

Return correct error code when finish input length is too long.

Bug: 63745895
Change-Id: I465bf9138a0a21363f89f2c6074f7108ee33af70

trusty/keymaster/trusty_keymaster_device.cpp

diff --git a/trusty/keymaster/trusty_keymaster_device.cpp b/trusty/keymaster/trusty_keymaster_device.cpp
index 5f16fd0..cfe94cc 100644
--- a/trusty/keymaster/trusty_keymaster_device.cpp
+++ b/trusty/keymaster/trusty_keymaster_device.cpp
@@ -576,7 +576,9 @@
         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) {