Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 am: 6ea9888d51 am: a055eb93c3 am: 15ca2a4763 am: ca50d7b66a

am: 64f0de7a13

Change-Id: I3b67824479c820d06e84e6611e4aff87265dab11
This commit is contained in:
Tianjie Xu 2017-01-18 22:37:48 +00:00 committed by android-build-merger
commit e4ec60e045

View file

@ -146,6 +146,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;