Commit graph

26813 commits

Author SHA1 Message Date
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
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
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
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
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
Josh Gao
a2fd28ee06 Merge changes I8b3e8a3b,I4976abef,I31dadb9c
* changes:
  tombstoned: silence spurious error messages.
  Actually don't start tombstoned until /data is mounted.
  debuggerd_handler: add SIGSYS to the list of handled signals.
2017-01-24 02:27:20 +00:00
Colin Cross
2e253cbcc6 Allow tkill
tkill and tgkill are syscalls that do not have glibc wrappers, but
they are required in order to send a signal to a specific thread.
Non-android software may call them directly with syscall().  Bionic
provides a wrapper for tgkill, so seccomp allows it, but not for
tkill.  Add tkill to the whitelist.

This can be reproduced with:
sleep 1000 & sleep 1 ; strace -p $!
then hit ctrl-C, and the shell will print "Bad system call" because
the strace process died with SIGSYS

Bug: 34586922
Test: repro case is fixed
Change-Id: Ib6962a967f2cc757f2906de7905e75e1b6d6f39f
2017-01-23 17:10:51 -08:00
Colin Cross
47afc6b64e Allow restart_syscall
restart_syscall is used by the kernel whenever a syscall with a
timeout is interrupted.  Whitelist it in seccomp to prevent
processes being killed with SIGSYS when being ptraced.

Bug: 34586922
Test: hwui_unit_tests
Change-Id: Ic47dcad33f3082eb5673c3c67fe17200d4daaf74
2017-01-23 17:05:01 -08:00
Josh Gao
8498016b81 tombstoned: silence spurious error messages.
Bug: none
Test: booted after deleting /data/tombstones/*
Test: crasher creates a tombstone
Change-Id: I8b3e8a3b521952412ebc955b2437bf8150220c16
2017-01-23 16:01:14 -08:00
Josh Gao
0ad5107e51 Actually don't start tombstoned until /data is mounted.
Bug: http://b/34461270
Test: boot is actually faster
Test: tombstoned still started by init
Change-Id: I4976abef108bbb6fad264f9b68cbc1fba711085b
2017-01-23 16:01:14 -08:00
Josh Gao
4decbe0d6c debuggerd_handler: add SIGSYS to the list of handled signals.
Bug: http://b/34586922
Test: kill -SYS $$
Change-Id: I31dadb9c65141d0c5556cc7256439e0a8d1519ab
2017-01-23 16:01:14 -08:00
Dimitry Ivanov
dee4bd236b New protocol for property_service
New protocol assumes that there is no limit on name or value
and effectively removed limit on property name length.

It also send back a uint32_t with error code (or 0 on success)

Bug: http://b/33926793
Test: mm, boot, run bionic-unit-tests --gtest_filter=prop*
Change-Id: Iac6290398ddc495e03f8fbbc3a79e923eff5df6f
2017-01-23 15:30:05 -08:00
Mark Salyzyn
2256a8d13e Merge "logcat: test: inject messages if necessary for tail test requirements"
am: d965fbfc9a

Change-Id: I54c0a687c054d49fe047f96e3b72a5c38c776158
2017-01-23 23:22:26 +00:00
Treehugger Robot
d965fbfc9a Merge "logcat: test: inject messages if necessary for tail test requirements" 2017-01-23 23:11:56 +00:00
Josh Gao
4e0648e7ca Merge "debuggerd_handler: properly crash when PR_GET_DUMPABLE is 0."
am: 90e05f68e2

Change-Id: Ie98457c464d36c183fe1d1c366d7b93ac2594657
2017-01-23 22:37:21 +00:00
Josh Gao
90e05f68e2 Merge "debuggerd_handler: properly crash when PR_GET_DUMPABLE is 0." 2017-01-23 22:30:56 +00:00
Josh Gao
fca7ca3585 debuggerd_handler: properly crash when PR_GET_DUMPABLE is 0.
Actually exit when receiving a signal via kill(2) or raise(2) and
PR_GET_DUMPABLE is 0.

Bug: none
Test: /data/nativetest/debuggerd_test/debuggerd_test32
Test: /data/nativetest64/bionic-unit-tests/bionic-unit-tests --gtest_filter=pthread_DeathTest.pthread_mutex_lock_null_64
Change-Id: I833a2a34238129237bd9f953959ebda51d8d04d7
2017-01-23 14:13:36 -08:00
Mark Salyzyn
15e585853f logcat: test: inject messages if necessary for tail test requirements
For the gTests logcat.tz, logcat.tail_3, logcat.tail_10,
logcat.tail_100, logcat.tail_1000 and logcat.tail_time tests inject
messages if we come up short should the background logging not be
sufficient to feed the test requirements.  Test frames run the
tests right after reboot requiring injection.  Will have radio
silence, so we also add kernel logs if available to help add to the
background logging activity level.

We also will inject a radio message for logcat.buckets so that test
can survive no radio content.

Test: set device to airplane mode (to stress this problem) then:
      adb logcat -b all -c && adb shell su root \
          /data/nativetest/logcat-unit-tests/logcat-unit-tests \
          --gtest_filter=logcat.tail_1000 (or others in this set)
Bug: 34454772
Change-Id: I5ec246552f3ab1fc9c5864ed69d63b851fdf538d
2017-01-23 13:33:02 -08:00
Josh Gao
450ad07aaf Merge changes Iacaa796f,I7549f674,Ic9d70880,I96cb09b7,I5c2658a8
am: 400973fa88

Change-Id: I14f9696a3312e34968b1e6966d32c643a2f5f6fc
2017-01-23 20:54:47 +00:00