summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTianjie Xu <xunchang@google.com>2017-01-18 23:40:19 +0100
committerandroid-build-merger <android-build-merger@google.com>2017-01-18 23:40:19 +0100
commite0d3b0ceab7de3ada458b698a8162cee47781dff (patch)
tree3cc2d750c86189f15be32c69115d93e34172447f
parentRemove outdated reference to icon_installing.png (diff)
parentAdd a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 am: 6ea9888d51 am: a055eb93c3 am: 15ca2a4763 am: ca50d7b66a (diff)
downloadandroid_bootable_recovery-e0d3b0ceab7de3ada458b698a8162cee47781dff.tar
android_bootable_recovery-e0d3b0ceab7de3ada458b698a8162cee47781dff.tar.gz
android_bootable_recovery-e0d3b0ceab7de3ada458b698a8162cee47781dff.tar.bz2
android_bootable_recovery-e0d3b0ceab7de3ada458b698a8162cee47781dff.tar.lz
android_bootable_recovery-e0d3b0ceab7de3ada458b698a8162cee47781dff.tar.xz
android_bootable_recovery-e0d3b0ceab7de3ada458b698a8162cee47781dff.tar.zst
android_bootable_recovery-e0d3b0ceab7de3ada458b698a8162cee47781dff.zip
-rw-r--r--verifier.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/verifier.cpp b/verifier.cpp
index 16cc7cf03..2d1b0e74f 100644
--- a/verifier.cpp
+++ b/verifier.cpp
@@ -146,6 +146,12 @@ int verify_file(unsigned char* addr, size_t length,
LOGI("comment is %zu bytes; signature %zu bytes from end\n",
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) {
LOGE("Signature start is in the footer");
return VERIFY_FAILURE;