aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Pasanen <dan.pasanen@gmail.com>2017-03-06 15:34:07 -0600
committerDan Pasanen <dan.pasanen@gmail.com>2017-03-06 15:34:07 -0600
commit9664707ba83812788aeb22cdbe4e9ba0c41b3589 (patch)
tree1cf4b7785a00ae43d6fb16e2213c616fcac0df41
parentc82175ba7f7f367443de02c74dfc94fcdbe753e8 (diff)
parent262603c9daf71475223dbaa47f639140d34473dd (diff)
downloadandroid_bootable_recovery-cm-14.1_old.tar.gz
android_bootable_recovery-cm-14.1_old.tar.bz2
android_bootable_recovery-cm-14.1_old.zip
Merge tag 'android-7.1.1_r25' into cm-14.1cm-14.1_old
Android 7.1.1 release 25 # gpg: Signature made Mon Mar 6 11:54:38 2017 CST # gpg: using DSA key E8AD3F819AB10E78 # gpg: Can't check signature: No public key
-rw-r--r--verifier.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/verifier.cpp b/verifier.cpp
index 16cc7cf0..2d1b0e74 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;