Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18e3e2a6 authored by Jocelyn Bohr's avatar Jocelyn Bohr Committed by android-build-merger
Browse files

Merge "Return correct error code when finish input length is too long." am: 90657bbe 

am: efea269a

Change-Id: Ida8d5c1742b6913b1f3b744c303e8abc3280b718
parents 88636a05 efea269a

trusty/keymaster/trusty_keymaster_device.cpp

+3 −1
Original line number Diff line number Diff line
@@ -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) {