PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,543 Commits 1 Branch 0 Tags
033225bc267f44eade5eba28099b2e52238f14d4
Commit Graph

8543 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tianjie Xu
033225bc26 Merge "Start adbd in user mode if bootloader is unlocked" am: b65dd9cb0c am: e5288e6b69 
am: 845bf488cb

Change-Id: I0ac1f3a38e0def87e3d06e34e49097f311da6a18
 2019-11-05 14:13:30 -08:00
Tianjie Xu
845bf488cb Merge "Start adbd in user mode if bootloader is unlocked" am: b65dd9cb0c 
am: e5288e6b69

Change-Id: I02c35302868aacdbc5ff513034f42e475a0805c7
 2019-11-05 14:07:27 -08:00
Tianjie Xu
e5288e6b69 Merge "Start adbd in user mode if bootloader is unlocked" 
am: b65dd9cb0c

Change-Id: I0daecb3e2a15c449babfc94d6f3deca8b55a4924
 2019-11-05 14:00:48 -08:00
Tianjie Xu
b65dd9cb0c Merge "Start adbd in user mode if bootloader is unlocked" 2019-11-05 21:37:07 +00:00
Xin Li
f289bba2cf [automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 547b9dc313 
am: 50a5d5da7e -s ours
am skip reason: subject contains skip directive

Change-Id: I88fce7b65ac0028b8140f0d07844feca55325151
 2019-10-31 14:01:10 -07:00
Xin Li
50a5d5da7e DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master 
am: 547b9dc313

Change-Id: I6a34c7e4acdbdcff47847f069ec3a989ed41b6ba
 2019-10-31 13:13:41 -07:00
Xin Li
547b9dc313 DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master 
Bug: 142003500
Change-Id: I551bae56668132a81bba652e01d7f8851f41a604
 2019-10-30 11:46:28 -07:00
Tianjie Xu
7d5c341962 Start adbd in user mode if bootloader is unlocked 
During automatic tests, we sometimes want to reboot the device out of
the rescue party remotely. And per http://go/recovery-adb-access, one
option is to start adbd in user build if the device has an unlocked
bootloader. This should not add more surface of attack. Because verified
boot is off with the unlocked bootloader, and the user can always flash
a custom recovery image that always starts adbd.

Bug: 141247819
Test: check adbd doesn't start in user build, unlock bootloader, and
check adbd starts.

Change-Id: I851746245f862cb4dfb01e6c3ad035f2c9f9ccec
 2019-10-30 10:26:56 -07:00
Xin Li
8f621f209d [automerger skipped] Merge Coral/Flame into AOSP master am: c73a97c6ee -s ours am: 5854abbb43 -s ours am: 341e99e9b4 -s ours 
am: 450fdc6943 -s ours
am skip reason: change_id Ifc73de385b7d857e8d0ceb20ff7275ba27bb200c with SHA1 cf6b4dce12 is in history

Change-Id: I60ba22e7886673d4ac45e3f7d12f48a9c2565686
 2019-10-26 22:23:08 -07:00
Xin Li
450fdc6943 [automerger skipped] Merge Coral/Flame into AOSP master am: c73a97c6ee -s ours am: 5854abbb43 -s ours 
am: 341e99e9b4 -s ours
am skip reason: change_id Ifc73de385b7d857e8d0ceb20ff7275ba27bb200c with SHA1 cf6b4dce12 is in history

Change-Id: I47843f764156112cfe2ff164c98186ca4a773d7d
 2019-10-26 22:16:07 -07:00
Xin Li
341e99e9b4 [automerger skipped] Merge Coral/Flame into AOSP master am: c73a97c6ee -s ours 
am: 5854abbb43 -s ours
am skip reason: change_id Ifc73de385b7d857e8d0ceb20ff7275ba27bb200c with SHA1 cf6b4dce12 is in history

Change-Id: Idc3f78654c812b946011f2b7b9dc179536108c94
 2019-10-26 22:10:12 -07:00
Xin Li
5854abbb43 [automerger skipped] Merge Coral/Flame into AOSP master 
am: c73a97c6ee -s ours
am skip reason: change_id Ifc73de385b7d857e8d0ceb20ff7275ba27bb200c with SHA1 cf6b4dce12 is in history

Change-Id: Ib87c586d8c444dbc786556c2e1e32c1eaa6f0c3f
 2019-10-26 21:59:40 -07:00
Xin Li
c73a97c6ee Merge Coral/Flame into AOSP master 
Bug: 141248619
Change-Id: If019c780684a841a87d49dcf55a6f2cfd638f69b
Merged-In: Ifc73de385b7d857e8d0ceb20ff7275ba27bb200c
 2019-10-25 10:27:44 -07:00
Josh Gao
0a4214046d Merge "Use adbd_system_binaries to track adbd's dependencies." am: e52af1a4cc am: cf6b4dce12 am: d7ec9f7267 
am: 8128a47d72

Change-Id: I02a45a1da5b05bf85eecb4885caab92e327aaebc
 2019-10-24 14:52:07 -07:00
Josh Gao
8128a47d72 Merge "Use adbd_system_binaries to track adbd's dependencies." am: e52af1a4cc am: cf6b4dce12 
am: d7ec9f7267

Change-Id: I1764b47f83236bab32673cccd2a4eb72c0f80d35
 2019-10-24 14:45:04 -07:00
Josh Gao
d7ec9f7267 Merge "Use adbd_system_binaries to track adbd's dependencies." am: e52af1a4cc 
am: cf6b4dce12

Change-Id: I5462dbc2fa3bc0b593cb19bad11e634fb3dca5e6
 2019-10-24 14:39:01 -07:00
Josh Gao
cf6b4dce12 Merge "Use adbd_system_binaries to track adbd's dependencies." 
am: e52af1a4cc

Change-Id: Ifc73de385b7d857e8d0ceb20ff7275ba27bb200c
 2019-10-24 14:31:07 -07:00
Josh Gao
e52af1a4cc Merge "Use adbd_system_binaries to track adbd's dependencies." 2019-10-24 20:29:25 +00:00
George Burgess IV
e08a9c45f8 Merge "bootable: leak less memory" am: 19073f2067 am: 37395747a8 am: 5026bd6047 
am: 67cce21e5d

Change-Id: I5997d7896b54bb7874c3598c9db4b4fad745dbc5
 2019-10-23 17:43:05 -07:00
George Burgess IV
67cce21e5d Merge "bootable: leak less memory" am: 19073f2067 am: 37395747a8 
am: 5026bd6047

Change-Id: I3d33089fb30ee61b960b18fdb1a785eb1ed2028e
 2019-10-23 17:36:04 -07:00
George Burgess IV
5026bd6047 Merge "bootable: leak less memory" am: 19073f2067 
am: 37395747a8

Change-Id: If49a5e1a2d997346cc1c1fc5a8652eb033a5f1a7
 2019-10-23 17:29:00 -07:00
George Burgess IV
37395747a8 Merge "bootable: leak less memory" 
am: 19073f2067

Change-Id: I55463429524f54941b47fce9f0c318ae47993414
 2019-10-23 17:22:00 -07:00
Treehugger Robot
19073f2067 Merge "bootable: leak less memory" 2019-10-24 00:03:38 +00:00
Josh Gao
a91e456fd4 Use adbd_system_binaries to track adbd's dependencies. 
required doesn't propagate from apexes, so we need a separate phony
target to track adbd's dependenecies.

Test: m
Change-Id: I13977d1376de63839bf182d2cfa56b5c6c63aba9
 2019-10-23 14:33:51 -07:00
George Burgess IV
1b03fc5493 bootable: leak less memory 
`misc_device_` is a std::string, so it allocates and manages its own
memory. Hence, the strdup here is immediately leaked.

Caught by the static analyzer

Bug: None
Test: TreeHugger
Change-Id: Iffb1ff60f6087e470a0979d202150567272e8b1c
 2019-10-23 12:09:07 -07:00
Xin Li
fd707a5fbd Skip QD1A.190821.011 in stage-aosp-master am: a5d835720a am: 1b130a6a11 
am: 50186b1213

Change-Id: I65ad2ff8d7d0306cec19d305fd55948255fe6859
 2019-10-16 21:53:07 -07:00
Xin Li
50186b1213 Skip QD1A.190821.011 in stage-aosp-master am: a5d835720a 
am: 1b130a6a11

Change-Id: Iee1c54ca65b238954a97bde782d52ab16a11c682
 2019-10-16 21:34:03 -07:00
Xin Li
1b130a6a11 Skip QD1A.190821.011 in stage-aosp-master 
am: a5d835720a

Change-Id: I5342bf9973627d4c3e373dd0e8d356d180921a74
 2019-10-16 21:16:02 -07:00
Tianjie Xu
b8ba2fa86e Merge "Force package installation with FUSE unless the package stores on device" 2019-10-16 22:20:27 +00:00
Xin Li
a5d835720a Skip QD1A.190821.011 in stage-aosp-master 
Bug: 141248619
Change-Id: I3404ae5bfb5c54df05495a62cba58cd4e818b2ff
 2019-10-16 15:19:11 -07:00
Tianjie Xu
58a27693b2 Force package installation with FUSE unless the package stores on device 
The non-A/B package installation is subject to TOC/TOU flaw if the
attacker can switch the package in the middle of installation. And the
most pratical case is to store the package on an external device, e.g. a
sdcard, and swap the device in the middle.

To prevent that, we can adopt the same protection as used in sideloading
a package with FUSE. Specifically, when we install the package with FUSE,
we read the entire package to cryptographically verify its signature.
The hash for each transfer block is recorded in the memory (TOC), and
the subsequent reads (TOU) will be rejected upon dectecting a mismatch.

This CL forces the package installation with FUSE when the package stays
on a removable media.

Bug: 136498130
Test: Run bin/recovery --update_package with various paths;
and packages are installed from FUSE as expected

Change-Id: Ibc9b095036a2fa624e8edf6c347ed4f12aef072f
 2019-10-16 11:35:17 -07:00
Nick Desaulniers
f395e0bf8f Merge "[bootable][recovery] fix -Wreorder-init-list" am: 0d76cad830 am: 843c0bbb01 am: bd99b40ae9 
am: 4f569e1436

Change-Id: I7d4a88d717ea3833b630a17bbab3c4d874d26b4f
 2019-10-11 09:40:10 -07:00
Nick Desaulniers
4f569e1436 Merge "[bootable][recovery] fix -Wreorder-init-list" am: 0d76cad830 am: 843c0bbb01 
am: bd99b40ae9

Change-Id: I199600ff980e87bcc4d2bb2078ca4a43f3f9ee32
 2019-10-11 09:34:51 -07:00
Nick Desaulniers
bd99b40ae9 Merge "[bootable][recovery] fix -Wreorder-init-list" am: 0d76cad830 
am: 843c0bbb01

Change-Id: I334bf1fd597e062896788443afb2455edc751bc6
 2019-10-11 09:29:11 -07:00
Nick Desaulniers
843c0bbb01 Merge "[bootable][recovery] fix -Wreorder-init-list" 
am: 0d76cad830

Change-Id: Ifd6c41936ad73a55b70c037fbc21bc12f6277a58
 2019-10-11 09:22:05 -07:00
Nick Desaulniers
0d76cad830 Merge "[bootable][recovery] fix -Wreorder-init-list" 2019-10-11 15:50:07 +00:00
David Anderson
41e43813fc Merge "Add IBootControl 1.1 support to libboot_control." am: 47bb0c8b59 am: 1cde53c252 am: 4c60b113b1 
am: b3a599342d

Change-Id: I669d944c56cfb5f3de2b65e4a68e7eca74176306
 2019-10-10 21:47:15 -07:00
Nick Desaulniers
1cb510d96f [bootable][recovery] fix -Wreorder-init-list 
C++20 will require members in a designated initializer to be in order
unlike C99.

Bug: 139945549
Test: mm
Change-Id: I6f8d658448f7e5dd980bf95b890b15cb0aab7407
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
 2019-10-10 16:33:58 -07:00
David Anderson
b3a599342d Merge "Add IBootControl 1.1 support to libboot_control." am: 47bb0c8b59 am: 1cde53c252 
am: 4c60b113b1

Change-Id: If9121dd1274963c38e60771ed597b1bf38cfadf4
 2019-10-10 12:45:53 -07:00
David Anderson
4c60b113b1 Merge "Add IBootControl 1.1 support to libboot_control." am: 47bb0c8b59 
am: 1cde53c252

Change-Id: I94f0a7c1e91d073e8764a4dfc8dd706352621525
 2019-10-10 12:38:30 -07:00
David Anderson
1cde53c252 Merge "Add IBootControl 1.1 support to libboot_control." 
am: 47bb0c8b59

Change-Id: I64763d0d67ad37686bc95c0c6e0f986b9a707267
 2019-10-10 12:31:35 -07:00
David Anderson
47bb0c8b59 Merge "Add IBootControl 1.1 support to libboot_control." 2019-10-10 19:19:49 +00:00
Tao Bao
42aaa3f5a6 Merge "Update OWNERS." am: 938e736f91 am: 03a5bd4d0d am: bfdff1ce7d 
am: 70e92b2a8e

Change-Id: I46f0ce5b4ee04cd038d610cf5b1c5863b46d4a6c
 2019-10-09 09:14:09 -07:00
Tao Bao
70e92b2a8e Merge "Update OWNERS." am: 938e736f91 am: 03a5bd4d0d 
am: bfdff1ce7d

Change-Id: I2b87d2d40e124f85b2809e2ce8e05a2350845a86
 2019-10-09 09:08:01 -07:00
Tao Bao
bfdff1ce7d Merge "Update OWNERS." am: 938e736f91 
am: 03a5bd4d0d

Change-Id: Ieb5a5d5c07432e13734c5ccfbfbc8c47bcaec07e
 2019-10-09 08:58:32 -07:00
Tao Bao
03a5bd4d0d Merge "Update OWNERS." 
am: 938e736f91

Change-Id: I905db1a8c1a46b8ca00a3aef10fdae4487562d6b
 2019-10-09 08:52:01 -07:00
Tao Bao
938e736f91 Merge "Update OWNERS." 2019-10-09 15:33:13 +00:00
Tao Bao
7d47aebd79 Update OWNERS. 
Test: N/A
Change-Id: I290fe43ee14fa3751f9ddb2c009bff235d8e1cff
 2019-10-08 20:32:42 -07:00
Tianjie Xu
f2dab76cc6 Merge "Run BORINGSSL_self_test() in updater_main" am: 8316f2f09a am: 0b89939ddf am: 49e732cf65 
am: ce1e355bd5

Change-Id: I00a80900757539a3532c82697b261fa598cf6c3c
 2019-10-07 16:29:52 -07:00
Tianjie Xu
ce1e355bd5 Merge "Run BORINGSSL_self_test() in updater_main" am: 8316f2f09a am: 0b89939ddf 
am: 49e732cf65

Change-Id: Ie9616bcce2f6a9b0f49e0925bc572e9e8d077e40
 2019-10-07 16:21:37 -07:00