summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTianjie Xu <xunchang@google.com>2017-01-18 23:43:48 +0100
committerandroid-build-merger <android-build-merger@google.com>2017-01-18 23:43:48 +0100
commit0f7f7e21a4ed40e05b24b75900849ea69afb4405 (patch)
treebedafec347c1800119dbab70539c428ff9ffb66c
parentMerge "minui: Export minui/minui.h." am: 13d15af08f am: ad20b76397 (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 am: 64f0de7a13 am: e4ec60e045 (diff)
downloadandroid_bootable_recovery-0f7f7e21a4ed40e05b24b75900849ea69afb4405.tar
android_bootable_recovery-0f7f7e21a4ed40e05b24b75900849ea69afb4405.tar.gz
android_bootable_recovery-0f7f7e21a4ed40e05b24b75900849ea69afb4405.tar.bz2
android_bootable_recovery-0f7f7e21a4ed40e05b24b75900849ea69afb4405.tar.lz
android_bootable_recovery-0f7f7e21a4ed40e05b24b75900849ea69afb4405.tar.xz
android_bootable_recovery-0f7f7e21a4ed40e05b24b75900849ea69afb4405.tar.zst
android_bootable_recovery-0f7f7e21a4ed40e05b24b75900849ea69afb4405.zip
-rw-r--r--verifier.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/verifier.cpp b/verifier.cpp
index 44098f70e..22f15235b 100644
--- a/verifier.cpp
+++ b/verifier.cpp
@@ -147,6 +147,12 @@ int verify_file(unsigned char* addr, size_t length,
LOG(INFO) << "comment is " << comment_size << " bytes; signature is " << signature_start
<< " bytes from end";
+ 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) {
LOG(ERROR) << "Signature start is in the footer";
return VERIFY_FAILURE;