summaryrefslogtreecommitdiffstats
path: root/trusty
diff options
context:
space:
mode:
Diffstat (limited to 'trusty')
-rw-r--r--trusty/keymaster/trusty_keymaster_device.cpp4
-rw-r--r--trusty/storage/tests/Android.bp1
2 files changed, 3 insertions, 2 deletions
diff --git a/trusty/keymaster/trusty_keymaster_device.cpp b/trusty/keymaster/trusty_keymaster_device.cpp
index e2342f3ba..ff741462e 100644
--- a/trusty/keymaster/trusty_keymaster_device.cpp
+++ b/trusty/keymaster/trusty_keymaster_device.cpp
@@ -577,7 +577,9 @@ keymaster_error_t TrustyKeymasterDevice::finish(keymaster_operation_handle_t ope
577 return error_; 577 return error_;
578 } 578 }
579 if (input && input->data_length > kMaximumFinishInputLength) { 579 if (input && input->data_length > kMaximumFinishInputLength) {
580 return KM_ERROR_INVALID_ARGUMENT; 580 ALOGE("%zu-byte input to finish; only %zu bytes allowed",
581 input->data_length, kMaximumFinishInputLength);
582 return KM_ERROR_INVALID_INPUT_LENGTH;
581 } 583 }
582 584
583 if (out_params) { 585 if (out_params) {
diff --git a/trusty/storage/tests/Android.bp b/trusty/storage/tests/Android.bp
index 3eff3f27a..1e4fced8f 100644
--- a/trusty/storage/tests/Android.bp
+++ b/trusty/storage/tests/Android.bp
@@ -21,7 +21,6 @@ cc_test {
21 "-g", 21 "-g",
22 "-Wall", 22 "-Wall",
23 "-Werror", 23 "-Werror",
24 "-std=gnu++11",
25 "-Wno-missing-field-initializers", 24 "-Wno-missing-field-initializers",
26 ], 25 ],
27 26