diff options
| author | Tianjie Xu <xunchang@google.com> | 2017-01-18 23:32:47 +0100 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-01-18 23:32:47 +0100 |
| commit | 15ca2a476378bc5440252c834a024560455664e1 (patch) | |
| tree | 86589e433fe58da7ba2423ae55d9747bf120f140 | |
| parent | DO NOT MERGE ANYWHERE init: move healthd to late-init (diff) | |
| parent | Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 (diff) | |
| download | android_bootable_recovery-15ca2a476378bc5440252c834a024560455664e1.tar android_bootable_recovery-15ca2a476378bc5440252c834a024560455664e1.tar.gz android_bootable_recovery-15ca2a476378bc5440252c834a024560455664e1.tar.bz2 android_bootable_recovery-15ca2a476378bc5440252c834a024560455664e1.tar.lz android_bootable_recovery-15ca2a476378bc5440252c834a024560455664e1.tar.xz android_bootable_recovery-15ca2a476378bc5440252c834a024560455664e1.tar.zst android_bootable_recovery-15ca2a476378bc5440252c834a024560455664e1.zip | |
| -rw-r--r-- | verifier.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/verifier.cpp b/verifier.cpp index 61e5adf0b..bf7071d13 100644 --- a/verifier.cpp +++ b/verifier.cpp @@ -144,6 +144,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; |