Add a checker for signature boundary in verifier am: 54ea136fde

am: 0a34b17c8b

Change-Id: I4dbba92ea717951307dbcb6bf287edf4f6144a38
This commit is contained in:
Tianjie Xu 2017-01-18 22:24:16 +00:00 committed by android-build-merger
commit fb80b4f72d

View file

@ -143,6 +143,12 @@ int verify_file(unsigned char* addr, size_t length,
LOGI("comment is %zu bytes; signature %zu bytes from end\n", LOGI("comment is %zu bytes; signature %zu bytes from end\n",
comment_size, signature_start); comment_size, signature_start);
if (signature_start > comment_size) {
LOGE("signature start: %zu is larger than comment size: %zu\n", signature_start,
comment_size);
return VERIFY_FAILURE;
}
if (signature_start <= FOOTER_SIZE) { if (signature_start <= FOOTER_SIZE) {
LOGE("Signature start is in the footer"); LOGE("Signature start is in the footer");
return VERIFY_FAILURE; return VERIFY_FAILURE;