diff options
author | Tianjie Xu <xunchang@google.com> | 2017-01-18 22:42:18 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-01-18 22:42:18 +0000 |
commit | f1278966750d17e2be69ced79396cdd3ffab3e94 (patch) | |
tree | 6199a1cc963c610149efb737043fdaee80244f08 | |
parent | 14bdbb6c7703854d2f8f4bafd19a4c2013c1d6ee (diff) | |
parent | e0d3b0ceab7de3ada458b698a8162cee47781dff (diff) | |
download | recovery-nougat-mr2-release.tar.gz |
Add 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: e4ec60e045android-7.1.2_r9android-7.1.2_r8android-7.1.2_r6android-7.1.2_r5android-7.1.2_r4android-7.1.2_r36android-7.1.2_r33android-7.1.2_r32android-7.1.2_r30android-7.1.2_r3android-7.1.2_r29android-7.1.2_r28android-7.1.2_r27android-7.1.2_r25android-7.1.2_r24android-7.1.2_r23android-7.1.2_r2android-7.1.2_r19android-7.1.2_r18android-7.1.2_r17android-7.1.2_r16android-7.1.2_r15android-7.1.2_r14android-7.1.2_r13android-7.1.2_r12android-7.1.2_r11android-7.1.2_r10android-7.1.2_r1nougat-mr2.3-releasenougat-mr2.2-releasenougat-mr2.1-releasenougat-mr2-releasenougat-mr2-pixel-release
am: e0d3b0ceab
Change-Id: I2b483f4cd082ef6cc0d9839c576a05161d980728
-rw-r--r-- | verifier.cpp | 6 |
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; |