Google Git
Sign in
android/platform/bootable/recovery/2c6c23f651abb3d215134dfba463eb72a5e9f8eb
commit
2c6c23f651abb3d215134dfba463eb72a5e9f8eb
[log]
author
Tianjie Xu <xunchang@google.com>
Fri Dec 16 16:24:09 2016 -0800
committer
gitbuildkicker <android-build@google.com>
Thu Jan 19 16:30:46 2017 -0800
tree
f90c7c7c1e65b8ad4279dfe4883e46a80e0a7321
parent
37d7d67ca216972cba9259aa5866220d6abfaf14 [diff]
Add a checker for signature boundary in verifier

The 'signature_start' variable marks the location of the signature
from the end of a zip archive. And a boundary check is missing where
'signature_start' should be within the EOCD comment field. This causes
problems when sideloading a malicious package. Also add a corresponding
test.

Bug: 31914369
Test: Verification fails correctly when sideloading recovery_test.zip on
angler.

Change-Id: I6ea96bf04dac5d8d4d6719e678d504f957b4d5c1
(cherry-picked from f69e6a9475983b2ad46729e44ab58d2b22cd74d0)

(cherry picked from commit 54ea136fded56810bf475885eb4bd7bf1b11f09c)
1 file changed
tree: f90c7c7c1e65b8ad4279dfe4883e46a80e0a7321
  1. applypatch/
  2. bootloader_message/
  3. edify/
  4. etc/
  5. fonts/
  6. minadbd/
  7. minui/
  8. minzip/
  9. mtdutils/
  10. otafault/
  11. res-hdpi/
  12. res-mdpi/
  13. res-xhdpi/
  14. res-xxhdpi/
  15. res-xxxhdpi/
  16. tests/
  17. tools/
  18. uncrypt/
  19. update_verifier/
  20. updater/
  21. res-560dpi ⇨ res-xxxhdpi
  22. adb_install.cpp
  23. adb_install.h
  24. Android.mk
  25. asn1_decoder.cpp
  26. asn1_decoder.h
  27. bootloader.h
  28. CleanSpec.mk
  29. common.h
  30. default_device.cpp
  31. device.cpp
  32. device.h
  33. error_code.h
  34. fuse_sdcard_provider.cpp
  35. fuse_sdcard_provider.h
  36. fuse_sideload.cpp
  37. fuse_sideload.h
  38. install.cpp
  39. install.h
  40. interlace-frames.py
  41. NOTICE
  42. print_sha1.h
  43. README.md
  44. recovery-persist.cpp
  45. recovery-persist.rc
  46. recovery-refresh.cpp
  47. recovery-refresh.rc
  48. recovery.cpp
  49. roots.cpp
  50. roots.h
  51. screen_ui.cpp
  52. screen_ui.h
  53. ui.cpp
  54. ui.h
  55. unique_fd.h
  56. verifier.cpp
  57. verifier.h
  58. wear_touch.cpp
  59. wear_touch.h
  60. wear_ui.cpp
  61. wear_ui.h
README.md

The Recovery Image

Quick turn-around testing

mm -j && m ramdisk-nodeps && m recoveryimage-nodeps

# To boot into the new recovery image
# without flashing the recovery partition:
adb reboot bootloader
fastboot boot $ANDROID_PRODUCT_OUT/recovery.img

Running the tests

# After setting up environment and lunch.
mmma -j bootable/recovery

# Running the tests on device.
adb root
adb sync data

# 32-bit device
adb shell /data/nativetest/recovery_unit_test/recovery_unit_test
adb shell /data/nativetest/recovery_component_test/recovery_component_test

# Or 64-bit device
adb shell /data/nativetest64/recovery_unit_test/recovery_unit_test
adb shell /data/nativetest64/recovery_component_test/recovery_component_test