PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,296 Commits 1 Branch 0 Tags
44f6b182dd5c3eb2d541c9386dee94de5677bbec
Commit Graph

7296 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tao Bao 7c09ac7e94 Merge "applypatch: Don't expose FindMatchingPatch()." am: b8d6523acf am: 29e1b7b4b2 am: 1b29658702 
am: c0044e9f89

Change-Id: Ie84bc3179912a6111cfa0c37c5f14500dbbb7c5e
 2016-12-28 22:39:58 +00:00
Tao Bao c0044e9f89 Merge "applypatch: Don't expose FindMatchingPatch()." am: b8d6523acf am: 29e1b7b4b2 
am: 1b29658702

Change-Id: I5b20f06908d34b0eba9b27b72cc686a57b52aa11
 2016-12-28 22:32:28 +00:00
Tao Bao d37ce8f082 imgdiff: Fix an edge case that leads to infinite loop. 
When the input image ends with the magic value sequence of 0x1f, 0x8b,
0x0b (optionally with 0x00), the image parsing code will be stuck in an
infinite loop.

Test: recovery_component_test passes.
Change-Id: Ie3629dfdc41360387b19cc3e0359c95ae4fb998e
 2016-12-28 14:29:48 -08:00
Tao Bao 1b29658702 Merge "applypatch: Don't expose FindMatchingPatch()." am: b8d6523acf 
am: 29e1b7b4b2

Change-Id: Ica4a7e02c1939065c404f9789941ee9206611643
 2016-12-28 22:24:27 +00:00
Tao Bao 29e1b7b4b2 Merge "applypatch: Don't expose FindMatchingPatch()." 
am: b8d6523acf

Change-Id: I4a1c4962ee9d78002898b678d88458f323ef5454
 2016-12-28 22:16:56 +00:00
Tao Bao b8d6523acf Merge "applypatch: Don't expose FindMatchingPatch()." 2016-12-28 22:11:49 +00:00
Tao Bao 6d83a14036 Merge "Add tests for imgdiff." am: 344c8eb453 am: 4fe022c4ed am: 4e2471d6dd 
am: e6c1d578bd

Change-Id: If99c2af21db684d3874649144f0d1ff780474616
 2016-12-28 18:33:13 +00:00
Tao Bao e6c1d578bd Merge "Add tests for imgdiff." am: 344c8eb453 am: 4fe022c4ed 
am: 4e2471d6dd

Change-Id: I2bad2ab0bf7a4ff180b14dc772adc66e43b5406e
 2016-12-28 18:25:42 +00:00
Tao Bao 4e2471d6dd Merge "Add tests for imgdiff." am: 344c8eb453 
am: 4fe022c4ed

Change-Id: I80d978c69b389089b9b47aa8170ab5041099ad94
 2016-12-28 18:18:42 +00:00
Tao Bao c8e79340e4 applypatch: Don't expose FindMatchingPatch(). 
Test: make
Change-Id: Ic77c4669574b6129e06aa6051804f419bcc8196c
 2016-12-28 10:11:22 -08:00
Tao Bao 4fe022c4ed Merge "Add tests for imgdiff." 
am: 344c8eb453

Change-Id: Iad8cb5e7ef3e3a09c305913a1367af8585d59529
 2016-12-28 18:11:11 +00:00
Tao Bao 344c8eb453 Merge "Add tests for imgdiff." 2016-12-28 18:05:45 +00:00
Tao Bao eb4a361c45 Merge "tests: Add test coverage for DirUtil." am: f24d2a6b39 am: 1b83e7e28d am: 7f0f49dd2b 
am: f9d1e205eb

Change-Id: I2ad7e507c25edeba24e80a3d74f3f3d7352e76c5
 2016-12-23 17:48:43 +00:00
Tao Bao f9d1e205eb Merge "tests: Add test coverage for DirUtil." am: f24d2a6b39 am: 1b83e7e28d 
am: 7f0f49dd2b

Change-Id: I2f4dbbb375894fe8695f99718401f2fcc457adb0
 2016-12-23 17:42:13 +00:00
Tao Bao 7f0f49dd2b Merge "tests: Add test coverage for DirUtil." am: f24d2a6b39 
am: 1b83e7e28d

Change-Id: I630381834ee21d5495859b82707c2c7b4560d97e
 2016-12-23 17:36:12 +00:00
Tao Bao 1b83e7e28d Merge "tests: Add test coverage for DirUtil." 
am: f24d2a6b39

Change-Id: I624cb64464427d06d2711f3b88ec94cd93ac06d3
 2016-12-23 17:30:12 +00:00
Tao Bao f24d2a6b39 Merge "tests: Add test coverage for DirUtil." 2016-12-23 17:22:51 +00:00
Tao Bao f19295c5dc tests: Add test coverage for DirUtil. 
Test: recovery_unit_test passes.
Change-Id: I764c56404c7ccdd57ae5486c946fbc9ac6ae7bc9
 2016-12-22 09:57:49 -08:00
Tao Bao fe3993f315 Merge "tests: Replace the O_RDONLY in access(2)." am: 3b9645288e am: baf422229d am: ef801f9a62 
am: 5a108b6e00

Change-Id: Ieae405488b3426364626be481ad2f5a5de5e4618
 2016-12-22 17:38:34 +00:00
Tao Bao a2f71cc4b0 Merge "tests: Add testcase for ZipUtil." am: aa305e9ce8 am: 6df1c4579e am: 830ab1c482 
am: 7720e1ab48

Change-Id: Ia09ba6d6b82a088142a964b8223bb2576d78604c
 2016-12-22 17:38:24 +00:00
Tao Bao 5a108b6e00 Merge "tests: Replace the O_RDONLY in access(2)." am: 3b9645288e am: baf422229d 
am: ef801f9a62

Change-Id: If7d21904a9db6a73a0498d500c12014d9bf1bfcb
 2016-12-22 17:33:33 +00:00
Tao Bao 7720e1ab48 Merge "tests: Add testcase for ZipUtil." am: aa305e9ce8 am: 6df1c4579e 
am: 830ab1c482

Change-Id: I253e34414b8fb4be173307ec0dabedb9c7f35380
 2016-12-22 17:33:23 +00:00
Tao Bao ef801f9a62 Merge "tests: Replace the O_RDONLY in access(2)." am: 3b9645288e 
am: baf422229d

Change-Id: I444696a344f8b37b852469e36b7cc6a925c9fc80
 2016-12-22 17:28:33 +00:00
Tao Bao 830ab1c482 Merge "tests: Add testcase for ZipUtil." am: aa305e9ce8 
am: 6df1c4579e

Change-Id: I7bcce5428e32bbae889e999bce18c091f552136d
 2016-12-22 17:28:23 +00:00
Tao Bao baf422229d Merge "tests: Replace the O_RDONLY in access(2)." 
am: 3b9645288e

Change-Id: Ib06f7298797ccd3f945542ecdd5366fb8e8eba6c
 2016-12-22 17:23:04 +00:00
Tao Bao 6df1c4579e Merge "tests: Add testcase for ZipUtil." 
am: aa305e9ce8

Change-Id: Id12e27ac3db4bcee6aa9de86867f05942cee3645
 2016-12-22 17:22:53 +00:00
Tao Bao 3b9645288e Merge "tests: Replace the O_RDONLY in access(2)." 2016-12-22 17:13:44 +00:00
Tao Bao aa305e9ce8 Merge "tests: Add testcase for ZipUtil." 2016-12-22 17:13:30 +00:00
Paul Crowley 1dc4b0932e Merge "Support a "ask before wiping" boot flag." am: 7ec4e6f5a3 am: bc344ba7b9 am: 11e9af909d 
am: 98631a39ca

Change-Id: I71acc0d5e3311cdb2782e9d5979ac75a9a79fe0a
 2016-12-22 16:14:21 +00:00
Paul Crowley 98631a39ca Merge "Support a "ask before wiping" boot flag." am: 7ec4e6f5a3 am: bc344ba7b9 
am: 11e9af909d

Change-Id: Ib07bb356ac6fac309716e76b2d9d4b1581518cdf
 2016-12-22 16:08:51 +00:00
Paul Crowley 11e9af909d Merge "Support a "ask before wiping" boot flag." am: 7ec4e6f5a3 
am: bc344ba7b9

Change-Id: I8f10c9fc59dce2954b8473b6eb648abe8d55612a
 2016-12-22 16:03:20 +00:00
Paul Crowley bc344ba7b9 Merge "Support a "ask before wiping" boot flag." 
am: 7ec4e6f5a3

Change-Id: I593eeaabf0f3c44c83d1a516dc05518dbfdd3660
 2016-12-22 15:57:51 +00:00
Treehugger Robot 7ec4e6f5a3 Merge "Support a "ask before wiping" boot flag." 2016-12-22 15:52:43 +00:00
Tao Bao e7e7b46666 tests: Add testcase for ZipUtil. 
Test: recovery_unit_test passes.
Change-Id: I8ad364e88aaee31579ed7206aad8e5620518d797
 2016-12-21 20:39:58 -08:00
Tao Bao a3ece96f9f tests: Replace the O_RDONLY in access(2). 
Although O_RDONLY gives the same value as F_OK (0), it's not the right
friend of access(2).

Also clean up the temporary files from ZipTest (TemporaryDir doesn't
like non-empty directory).

Test: recovery_unit_test passes and has no leftover.
Change-Id: I66b90e43c0954c89ce08b36b9e2b4e84183b28f5
 2016-12-21 18:56:53 -08:00
Paul Crowley 08404b48f7 Support a "ask before wiping" boot flag. 
In the event of a catastrophic data error which should never happen,
ask the user before wiping the device.

Test: Cause an init builtin to fail and generate this error, observe.
Bug: 28693324
Change-Id: I38a2b815157d816cba1f30ad37eb4cdcc01db582
 2016-12-21 13:38:48 -08:00
Tao Bao 97555da4a6 Add tests for imgdiff. 
Factor out libimgdiff static library for testing purpose.

This CL adds the imgdiff tests on host and on target both (similar to
libimgpatch). In practice, we only need imgdiff binary on host, and
libimgpatch on target. But they should build and pass tests on both
platforms.

Test: recovery_host_test passes; recovery_component_test passes.
Change-Id: I0eafb7faf727cdf70066310e845af6ee245d4f60
 2016-12-19 16:53:03 -08:00
Tianjie Xu f616da1726 DO NOT MERGE: 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 f69e6a9475)
(cherry picked from commit 54ea136fde)
 2016-12-19 16:46:44 -08:00
Tianjie Xu 71a67b3354 Merge "Add a checker for signature boundary in verifier" 2016-12-19 20:44:37 +00:00
Tao Bao c46af77cfc Merge "Bugfix:updater always retry apply patch failed,when memcpy failed." am: e81719dde3 am: b0337774b2 am: 88bd5d59de 
am: 794075c575

Change-Id: Ic26d6041fb77e1969ad37a691b7d7cd422e9e9e9
 2016-12-19 19:33:37 +00:00
Tao Bao 794075c575 Merge "Bugfix:updater always retry apply patch failed,when memcpy failed." am: e81719dde3 am: b0337774b2 
am: 88bd5d59de

Change-Id: Ia1127521eb2d1730f82be920886337c8d73635ff
 2016-12-19 19:30:08 +00:00
Tao Bao 88bd5d59de Merge "Bugfix:updater always retry apply patch failed,when memcpy failed." am: e81719dde3 
am: b0337774b2

Change-Id: I8a874f491f6a6ee452a3a18ae53920903ec11a44
 2016-12-19 19:26:39 +00:00
Tao Bao b0337774b2 Merge "Bugfix:updater always retry apply patch failed,when memcpy failed." 
am: e81719dde3

Change-Id: I1a833b07b4baa45f23930b4231c35fba2c2ac6ef
 2016-12-19 19:24:06 +00:00
Tao Bao e81719dde3 Merge "Bugfix:updater always retry apply patch failed,when memcpy failed." 2016-12-19 19:19:41 +00:00
katao 9a6f520419 Bugfix:updater always retry apply patch failed,when memcpy failed. 
https://code.google.com/p/android/issues/detail?id=230602
On the second attempt， open the file with O_RDONLY，
which causing a write failure。

Change-Id: If89165b8c7619fe25722073a46b3cc7c61530a71
Signed-off-by: katao <ustckato@gmail.com>
 2016-12-19 08:51:07 +00:00
Tianjie Xu 54ea136fde 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 f69e6a9475)
 2016-12-16 16:24:09 -08:00
Tianjie Xu f69e6a9475 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
 2016-12-16 16:01:42 -08:00
Tim Kryger cc1ecf792f Remove outdated reference to icon_installing.png am: 48be23c8ed am: 14bdbb6c77 -s ours 
am: fe98435fa9

Change-Id: I23742456b33d6b41bed0efcd521bbc747ea46be0
 2016-12-16 01:20:49 +00:00
Tim Kryger 814e854965 Merge "resolve merge conflicts of 48be23c to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp am: 910c83b915 
am: 5ade8ae26c

Change-Id: I217cc8a412abe2fe8e3714b816096cd62d5bdb13
 2016-12-16 01:20:37 +00:00
Tim Kryger 5c38124f8f resolve merge conflicts of 48be23c to nyc-mr1-dev-plus-aosp am: a5876e43f7 
am: a3e2f0b082

Change-Id: Ief76f7544f942f88e058fd9784c152583bc73290
 2016-12-16 01:20:26 +00:00