diff options
| author | Tianjie Xu <xunchang@google.com> | 2017-01-18 23:24:16 +0100 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-01-18 23:24:16 +0100 |
| commit | fb80b4f72dd29d1dc61c434e86712eedb652f98f (patch) | |
| tree | bc0b7413955600ea8e7e5feb72d1553be5c85d0f | |
| parent | resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e (diff) | |
| parent | Add a checker for signature boundary in verifier (diff) | |
| download | android_bootable_recovery-fb80b4f72dd29d1dc61c434e86712eedb652f98f.tar android_bootable_recovery-fb80b4f72dd29d1dc61c434e86712eedb652f98f.tar.gz android_bootable_recovery-fb80b4f72dd29d1dc61c434e86712eedb652f98f.tar.bz2 android_bootable_recovery-fb80b4f72dd29d1dc61c434e86712eedb652f98f.tar.lz android_bootable_recovery-fb80b4f72dd29d1dc61c434e86712eedb652f98f.tar.xz android_bootable_recovery-fb80b4f72dd29d1dc61c434e86712eedb652f98f.tar.zst android_bootable_recovery-fb80b4f72dd29d1dc61c434e86712eedb652f98f.zip | |
| -rw-r--r-- | verifier.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/verifier.cpp b/verifier.cpp index eeff95a59..3d4f603a2 100644 --- a/verifier.cpp +++ b/verifier.cpp @@ -143,6 +143,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; |