Commit graph

27316 commits

Author SHA1 Message Date
bowgotsai
11c2155df4 Merge "fs_mgr: support using libavb to enable dm-verity" am: 0a3c2392c7
am: 07c1bcbc7b

Change-Id: Ia280284d106dd7263a85de9aa9f8309d7fecab93
2017-01-25 18:30:09 +00:00
bowgotsai
07c1bcbc7b Merge "fs_mgr: support using libavb to enable dm-verity"
am: 0a3c2392c7

Change-Id: I738a3e6596dd465e6d0b0f7d625617bce0277acf
2017-01-25 18:28:10 +00:00
Treehugger Robot
0a3c2392c7 Merge "fs_mgr: support using libavb to enable dm-verity" 2017-01-25 18:24:30 +00:00
Robert Sesek
31992ebcaf Merge "Ensure property_set connection sockets are CLOEXEC." am: 1ef5ecaca2
am: 5d6e678b9d

Change-Id: I6421dc4b6c504e9f662addcf567ddc4188883e99
2017-01-25 18:23:36 +00:00
Robert Sesek
5d6e678b9d Merge "Ensure property_set connection sockets are CLOEXEC."
am: 1ef5ecaca2

Change-Id: Ia46f838e676a4f78a01ac6e9d76af8c112dcc74e
2017-01-25 18:18:38 +00:00
Treehugger Robot
1ef5ecaca2 Merge "Ensure property_set connection sockets are CLOEXEC." 2017-01-25 18:09:16 +00:00
Elliott Hughes
d505d0c747 Merge "Remove unused klog_get_level." am: acdb06de6b
am: 5ecc8d2439

Change-Id: Ibd19ac45e18bf0e9a4c5064c20d7bf429d7d9c5c
2017-01-25 16:45:42 +00:00
Elliott Hughes
5ecc8d2439 Merge "Remove unused klog_get_level."
am: acdb06de6b

Change-Id: I4eec1c5b169f5e51e2a3ac461c050fc25373e2aa
2017-01-25 16:43:14 +00:00
Elliott Hughes
acdb06de6b Merge "Remove unused klog_get_level." 2017-01-25 16:39:11 +00:00
Robert Sesek
ca2da60206 Ensure property_set connection sockets are CLOEXEC.
When handling a property control message to start a service, the
connection socket was being left open. The child socket FD would then be
inherited by the service from init as "/null".

Bug: 34698883

Test: adb shell start webview_zygote32; adb shell ls -l /proc/<pid>/fd,
      no "/null" FD open.

Change-Id: I25f34e1bfc1414e6143acf23414b05f5a241cace
2017-01-25 08:08:51 -05:00
bowgotsai
b51722b4e2 fs_mgr: support using libavb to enable dm-verity
external/avb/libavb provides the new Android Verified Boot (AVB) flow.
It has different verity metadata format than previous formats in
fs_mgr_verity.cpp fs_mgr should support using libavb to read the metadata
(a.k.a. HASHTREE descriptor in AVB) to enable dm-verity in kernel.

Two important files in this commit:

 - fs_mgr_avb_ops.c: an implementation of struct AvbOps* for libavb to do
   platform dependent I/O operations, e.g., read_from_partition.

 - fs_mgr_avb.cpp: it reads the metadata (a.k.a. vbmeta images in AVB) from
   all partitions, verifies its integrity against the values of
   androidboot.vbmeta.{hash_alg, size, digest} passed from bootloader in
   kernel command line. Then enable dm-verity for partitions having the
   corresponding HASHTREE descriptor and with an 'avb' fstab flag.

Bug: 31264231
Test: Enable dm-verity on /system partition
Test: Enable dm-verity with FEC on /system partition

Change-Id: I4652806984fe5a30c61be0839135b5ca78323d38
2017-01-25 18:03:20 +08:00
Alexey Polyudov
3d60ec646e Merge "fastboot: add EDL mode support" am: 894f3ea7cb
am: 87ebc42750

Change-Id: I8017761d3180e96497a3c7d328c942e4559d0a2f
2017-01-25 07:14:23 +00:00
Alexey Polyudov
87ebc42750 Merge "fastboot: add EDL mode support"
am: 894f3ea7cb

Change-Id: Ibe48ed1e7ae65234226100cb73962abff99e741a
2017-01-25 07:11:53 +00:00
Treehugger Robot
894f3ea7cb Merge "fastboot: add EDL mode support" 2017-01-25 07:07:47 +00:00
Connor O'Brien
4513c2c086 Merge "Add eraseblk and logicalblk fs_mgr flags" am: 68ab5b0589
am: d73ef4e6c8

Change-Id: Ia0d294bcacb85b37fe0c40b53b7be7fe59576dcf
2017-01-25 04:22:23 +00:00
Connor O'Brien
d73ef4e6c8 Merge "Add eraseblk and logicalblk fs_mgr flags"
am: 68ab5b0589

Change-Id: I0be08a0e9eceff390626224e6643a6920f15c6fd
2017-01-25 04:16:27 +00:00
Treehugger Robot
68ab5b0589 Merge "Add eraseblk and logicalblk fs_mgr flags" 2017-01-25 04:14:00 +00:00
Dimitry Ivanov
180827da29 Merge "Revert "Revert "New protocol for property_service""" am: 5a32cc9911
am: 4a0f6f867e

Change-Id: Ifcadf064ca100b5eb127f4579e7fe8a4413872af
2017-01-25 03:59:03 +00:00
Dimitry Ivanov
4a0f6f867e Merge "Revert "Revert "New protocol for property_service"""
am: 5a32cc9911

Change-Id: Idf71f7b7bf9740d040ec8c0c06fc5aa77a76c119
2017-01-25 03:56:56 +00:00
Dimitry Ivanov
5a32cc9911 Merge "Revert "Revert "New protocol for property_service""" 2017-01-25 03:54:04 +00:00
Alexey Polyudov
e0bfb759cb fastboot: add EDL mode support
reboot device into emergency download mode (if HW supports it)

Change-Id: If068fdd041c5bdc7bf65515a78aabf18082cba2a
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
2017-01-24 18:55:17 -08:00
Connor O'Brien
46fec487a9 Add eraseblk and logicalblk fs_mgr flags
When doing a factory reset in recovery, flash erase & logical block
sizes are needed for tuning the parameters of the new userdata image.
Add flags to allow this information to be stored in recovery.fstab

Test: Factory reset marlin & confirm userdata is rebuilt correctly
Bug: 33243520
Change-Id: I6c4414d4e9026be4a3646523656ac151e93015e7
Signed-off-by: Connor O'Brien <connoro@google.com>
2017-01-24 18:43:39 -08:00
Vijay Venkatraman
ebc9f4eb58 Merge "Revert "Exporting C headers from system/core"" am: 22b7f76a00
am: 16aac283f4

Change-Id: I61ecfc1ff6f0f94a297db4e8661d6c2e2eefad53
2017-01-25 00:56:53 +00:00
Tao Bao
bf90005832 Merge "healthd: Track the API change of minui/minui.h." am: fb8c70cf4b
am: 93e35655c4

Change-Id: Ic77cd6f293d2875e251def1e75aff33a612d7077
2017-01-25 00:56:07 +00:00
Vijay Venkatraman
16aac283f4 Merge "Revert "Exporting C headers from system/core""
am: 22b7f76a00

Change-Id: I26ce7c7ec89f020d55ba0fc35d8d298106d976d3
2017-01-25 00:54:30 +00:00
Tao Bao
93e35655c4 Merge "healthd: Track the API change of minui/minui.h."
am: fb8c70cf4b

Change-Id: If7d4fd9b17fab1b306a9c7ec1c23cbc546709b48
2017-01-25 00:53:40 +00:00
Vijay Venkatraman
22b7f76a00 Merge "Revert "Exporting C headers from system/core"" 2017-01-25 00:53:07 +00:00
Tao Bao
fb8c70cf4b Merge "healthd: Track the API change of minui/minui.h." 2017-01-25 00:49:48 +00:00
Vijay Venkatraman
a3f2be2b73 Revert "Exporting C headers from system/core"
This reverts commit 3c6763ca21.

Change-Id: If3b3e106478d28a5df927d57649abdca0a99dd0e
2017-01-25 00:44:08 +00:00
Evgenii Stepanov
8400135490 Merge "Don't disable all sanitizers in liblog, just asan." am: f38ae34bbc
am: dc9c27e5ec

Change-Id: I39d9015ffc8af873379896880ee9ccc0a880cab0
2017-01-24 23:07:49 +00:00
Evgenii Stepanov
dc9c27e5ec Merge "Don't disable all sanitizers in liblog, just asan."
am: f38ae34bbc

Change-Id: Id2b5cda15bad7dfc25c940b3eb1033cc92b309cc
2017-01-24 23:05:50 +00:00
Evgenii Stepanov
f38ae34bbc Merge "Don't disable all sanitizers in liblog, just asan." 2017-01-24 23:00:54 +00:00
Vijay Venkatraman
e7bbb3c4b0 Merge "Exporting C headers from system/core" am: 897bc9b2b3
am: e6464ca571

Change-Id: I486fcbbe64b2eaaeb281fd4fba64933ee914c82e
2017-01-24 22:48:48 +00:00
Vijay Venkatraman
e6464ca571 Merge "Exporting C headers from system/core"
am: 897bc9b2b3

Change-Id: Ia78e850305b0307ae56dd63b945e6d412fbbc9fb
2017-01-24 22:46:47 +00:00
Vijay Venkatraman
897bc9b2b3 Merge "Exporting C headers from system/core" 2017-01-24 22:43:32 +00:00
Jin Qian
f4b9def2db Merge "fs_mgr: fix clang static analyzer warning" am: d945f27cd6
am: a1299d28eb

Change-Id: I3aedde8f3f325f8f2af71ac4569921b3b4f2c0f7
2017-01-24 21:02:40 +00:00
Dimitry Ivanov
c9bb0338bc Revert "Revert "New protocol for property_service""
This reverts commit 70c4ecf2b5.
Bug: http://b/33926793
Bug: http://b/34670529
Test: run bionic-unit-tests --gtest_filter=prop*

Change-Id: I75b28146805ff37fbdcf0543ccb515ee5895eb2a
2017-01-24 13:01:13 -08:00
Jin Qian
a1299d28eb Merge "fs_mgr: fix clang static analyzer warning"
am: d945f27cd6

Change-Id: I39f9be5faec32f85880a8c571f0773142322dbcd
2017-01-24 21:00:39 +00:00
Treehugger Robot
d945f27cd6 Merge "fs_mgr: fix clang static analyzer warning" 2017-01-24 20:58:19 +00:00
Evgenii Stepanov
ffdabdc6f2 Don't disable all sanitizers in liblog, just asan.
ASan runtime library depends on liblog, so we have to disable ASan,
but nothing else.

Bug: 33091541
Test: SANITIZE_TARGET=address keeps working
Change-Id: I6e22925b7f1d5ec86fe1bd8c00dba4c3e86ddf3f
2017-01-24 12:57:23 -08:00
Dimitry Ivanov
34770bcf94 Merge "Revert "New protocol for property_service"" am: 17767caed9
am: 54339350af

Change-Id: I064b4ea247a6c22544f789f041194e510dfca0b3
2017-01-24 20:07:44 +00:00
Dimitry Ivanov
54339350af Merge "Revert "New protocol for property_service""
am: 17767caed9

Change-Id: I59613b73239d70216fbbe505f48dc913308c4dd0
2017-01-24 20:05:44 +00:00
Dimitry Ivanov
17767caed9 Merge "Revert "New protocol for property_service"" 2017-01-24 20:00:44 +00:00
Vijay Venkatraman
a7d53bcaf2 Merge "Replaced include log/logger.h with log/log.h in debuggerd" am: 5fe1cebe7c
am: 4a7eb14276

Change-Id: I75890537b17cd9ea6c081a0926320730bb01ab8a
2017-01-24 19:14:34 +00:00
Vijay Venkatraman
4a7eb14276 Merge "Replaced include log/logger.h with log/log.h in debuggerd"
am: 5fe1cebe7c

Change-Id: I9c5078ae7e9513767540897d791adac569bce894
2017-01-24 19:11:03 +00:00
Vijay Venkatraman
5fe1cebe7c Merge "Replaced include log/logger.h with log/log.h in debuggerd" 2017-01-24 19:07:30 +00:00
Dimitry Ivanov
70c4ecf2b5 Revert "New protocol for property_service"
This reverts commit dee4bd236b.
Bug: http://b/33926793
Bug: http://b/34670529

Change-Id: Ife3a5a471ee29cb12c2c41efef885ba40b8970e6
2017-01-24 18:38:09 +00:00
Colin Cross
33d0bb6483 Merge "Allow tkill" am: 9fd1190790
am: 81b76391d3

Change-Id: Ib141600dbd9a5471a1c452d2514f89e0d234b5d6
2017-01-24 04:37:57 +00:00
Colin Cross
81b76391d3 Merge "Allow tkill"
am: 9fd1190790

Change-Id: Id45daedeecc72308db9616b302a7bf23bd4beb28
2017-01-24 04:34:57 +00:00
Treehugger Robot
9fd1190790 Merge "Allow tkill" 2017-01-24 04:31:26 +00:00