DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev

Change-Id: Ie52a9abae416bbb84ddc61bb7159a531de778c15
2017-01-19 16:18:31 -08:00
parent a41cc29447
commit 4eb997d52b
1 changed files with 7 additions and 0 deletions
@@ -155,6 +155,13 @@ int verify_file(const char* path, const Certificate* pKeys, unsigned int numKeys
    LOGI("comment is %d bytes; signature %d 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);
+        fclose(f);
+        return VERIFY_FAILURE;
+    }
+
    if (signature_start <= FOOTER_SIZE) {
        LOGE("Signature start is in the footer");
        fclose(f);