Commit Graph

27130 Commits

Author SHA1 Message Date
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 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 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 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 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 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 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
Josh Gao 0a37901b9f crash_dump: properly dump when we can't talk to tombstoned.
Bug: http://b/32466479
Test: stop tombstoned; logcat -c; crasher; logcat
Change-Id: I16c010cc1865b4e1db8d2b85c904a2e074f28f1f
2017-01-24 15:22:43 -08: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 75acc7bf81 Exporting C++ headers from system/core
Moved headers from include/libutils and include/libsysutils to
libutils/include and libsysutils/include respectively, so they can be
exported via these libs. They needed to be moved since Soong does
not allow export from external folder.

Added symlink from old locations. They are needed since Soong
includes system/core/include by default. Once all modules are
cleaned up to explicitly add the required libs, the symlinks will be
removed.

Moved headers of libutils to libutils_headers. They should be used
by modules for header-only inlines. Added libutils_headers as
dependency of libutils.

Split of C++ headers into those that have no dependency and those that
have dependency on libutils.so will be handled in a later CL.

Test: Add above libs to shared lib of local module
Change-Id: I122db72056b26b1f39bad1d9a0c2a1c5efda3550
2017-01-24 22:51:36 +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
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 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 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
Mark Salyzyn b5b8796785 logd: multiple identical do not report expired
Report multiple identical chatty messages differently than for
regular expire chatty messages.  Multiple identical will
report identical count, while spam filter will report
expire count.

This should reduce the expected flood of people confused
but chatty messages in continuous logcat output.

Test: gTest logd_unit_tests --gtest_filter=logd.multiple*
Change-Id: Iad93d3efc6a3938a4b87ccadddbd86626a015d44
2017-01-24 11:02:18 -08: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 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
Vijay Venkatraman a95acea5bf Replaced include log/logger.h with log/log.h in debuggerd
Test: Compile debuggerd
Change-Id: I33d12708993bd6818907b8cbb0a7a40672ad320d
2017-01-23 20:11:51 -08:00
Colin Cross 5b0dd3cbe3 Merge "Allow restart_syscall"
am: 1b3350e4ca

Change-Id: I204d0bfb4c80aada7d7e4027c274f3c07ce22783
2017-01-24 04:10:55 +00:00
Treehugger Robot 1b3350e4ca Merge "Allow restart_syscall" 2017-01-24 04:08:48 +00:00
Hung-ying Tyan fc8f2db476 Merge "init: add ro.boot.init_rc"
am: 571cd23fa8

Change-Id: Ie945f49d9ce1fe849140d522b53f6346865d2f1e
2017-01-24 04:01:25 +00:00
Treehugger Robot 571cd23fa8 Merge "init: add ro.boot.init_rc" 2017-01-24 03:59:13 +00:00
Dimitry Ivanov 8077c96655 Merge "New protocol for property_service"
am: 038b8f086f

Change-Id: Ica1faa48b08b638ab9a77cb29d5d74a74fd0071e
2017-01-24 02:56:29 +00:00
Dimitry Ivanov 038b8f086f Merge "New protocol for property_service" 2017-01-24 02:54:34 +00:00
Josh Gao 33762ff915 Merge changes I8b3e8a3b,I4976abef,I31dadb9c
am: a2fd28ee06

Change-Id: I9fd36550b5a03b7cbccd77d39f7facb877ec1426
2017-01-24 02:35:00 +00:00
Josh Gao 8fb50dc76c tombstoned: silence spurious error messages.
am: 8498016b81

Change-Id: I6385f9fbcdd17e67d7e60bcfddd9c164b24e7f8c
2017-01-24 02:34:59 +00:00
Josh Gao 1170d8201d Actually don't start tombstoned until /data is mounted.
am: 0ad5107e51

Change-Id: I829a088921adb6253a1dec3c39a1ffe171b90f5c
2017-01-24 02:34:54 +00:00
Josh Gao 7325c7a220 debuggerd_handler: add SIGSYS to the list of handled signals.
am: 4decbe0d6c

Change-Id: I01f3ff76051bddc16abe8b4909ffb22b62e0f372
2017-01-24 02:34:49 +00:00