commit 0a34b17c8b477bcf41d7ba5f1f34fe5308ef79e1
author Tianjie Xu <xunchang@google.com> Wed Jan 18 22:22:16 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 18 22:22:16 2017 +0000
tree bc0b7413955600ea8e7e5feb72d1553be5c85d0f
parent 1f814d7630c56cc9e825ed411e068414c97acb6c
parent 54ea136fded56810bf475885eb4bd7bf1b11f09c

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

Change-Id: Ide2da96e322c6a913b7f2e950e43c4d11278338e

verifier.cpp

diff --git a/verifier.cpp b/verifier.cpp
index eeff95a..3d4f603 100644
--- a/verifier.cpp
+++ b/verifier.cpp
@@ -143,6 +143,12 @@
     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;