From f1e5edf7656d5f1f577fa93a5878274b14aa0e84 Mon Sep 17 00:00:00 2001
From: Jocelyn Bohr <bohr@google.com>
Date: Thu, 3 Aug 2017 13:59:10 -0700
Subject: [PATCH] Return correct error code when finish input length is too
 long.

Bug: 63745895
Change-Id: I465bf9138a0a21363f89f2c6074f7108ee33af70
---
 trusty/keymaster/trusty_keymaster_device.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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) {