Commit graph

27583 commits

Author SHA1 Message Date
Josh Gao
5d6ea5a9bd Merge "init: don't start tombstoned until /data is mounted." am: b479a5002e am: f83489c02c
am: d7db8378d0

Change-Id: I37f553a19341d351dcf1fbb275352802b9b09e62
2017-01-20 22:23:54 +00:00
Josh Gao
d7db8378d0 Merge "init: don't start tombstoned until /data is mounted." am: b479a5002e
am: f83489c02c

Change-Id: I3334af98c1eb7c8b503ecea6700459454533dd44
2017-01-20 22:20:54 +00:00
Josh Gao
f83489c02c Merge "init: don't start tombstoned until /data is mounted."
am: b479a5002e

Change-Id: I00bbcc2adbdc31486e9fe5e4deed9901feacbb4c
2017-01-20 22:17:53 +00:00
Treehugger Robot
b479a5002e Merge "init: don't start tombstoned until /data is mounted." 2017-01-20 22:13:38 +00:00
James Hawkins
d8c97154b8 Merge "bootstat: Remove debug logging of bootstat_mtime_matches_content." am: b5e530f720 am: cd39315a35
am: 450e389645

Change-Id: Ib572448ba45bf432a45fbfc271e4c3b085019739
2017-01-20 21:56:22 +00:00
James Hawkins
450e389645 Merge "bootstat: Remove debug logging of bootstat_mtime_matches_content." am: b5e530f720
am: cd39315a35

Change-Id: I6cdf2b863074cbdd33ab56eb007ee9913877688d
2017-01-20 21:53:20 +00:00
James Hawkins
cd39315a35 Merge "bootstat: Remove debug logging of bootstat_mtime_matches_content."
am: b5e530f720

Change-Id: Id5fffdf3564500b129ccc35a429dd323f422e30b
2017-01-20 21:50:20 +00:00
Treehugger Robot
b5e530f720 Merge "bootstat: Remove debug logging of bootstat_mtime_matches_content." 2017-01-20 21:46:56 +00:00
Josh Gao
42a0fed78b init: don't start tombstoned until /data is mounted.
When vold mounts the encrypted /data partition, it first checks for and
kills processes that have open fds to the tmpfs placeholder at /data.
This resulted in a 20 second boot-time regression (vold's timeout period)
when tombstoned was started before vold.

Bug: http://b/34461270
Test: boot is faster, no messages from vold in console spew
Test: tombstoned still started by init
Change-Id: Ib5e9ddb05f40c9da852f00e103861c6ff2d94888
2017-01-20 13:18:51 -08:00
Josh Gao
23b0923f7a Merge "crash_dump: don't abort if we fail to attach a sibling." am: ac0403b1e5 am: 2bd9fa0612
am: 5e5a168453

Change-Id: If88d53a7d234fd01b2e59c9656d54cbcf956737d
2017-01-20 21:17:04 +00:00
Josh Gao
5e5a168453 Merge "crash_dump: don't abort if we fail to attach a sibling." am: ac0403b1e5
am: 2bd9fa0612

Change-Id: If86a320e978aa7c16c7d8f8835c21efb78d8eb66
2017-01-20 21:10:48 +00:00
Josh Gao
2bd9fa0612 Merge "crash_dump: don't abort if we fail to attach a sibling."
am: ac0403b1e5

Change-Id: Iadd44cbe99bc21a7d067815960c5aa250ddedde5
2017-01-20 21:07:47 +00:00
Josh Gao
ac0403b1e5 Merge "crash_dump: don't abort if we fail to attach a sibling." 2017-01-20 21:02:30 +00:00
Josh Gao
42fd74bd1f crash_dump: don't abort if we fail to attach a sibling.
A TOCTOU race can occur between listing threads and attaching them.
Don't abort and leave the process in a stopped state when this happens.

Bug: http://b/34472671
Test: while true; do debuggerd -b `pidof audioserver`; done
Change-Id: Ib1632c3423fddf506b5c7874223c82fada78a85e
2017-01-20 12:55:07 -08:00
Dave Weinstein
a69b7ea3a4 Merge "Move the kptr_restrict setting from init.rc to init.cpp." am: c734a0a9ee am: 776978788b
am: 7e79a571fd

Change-Id: Idcf066812921022a16c215a345c286b789c8641a
2017-01-20 20:31:16 +00:00
Dave Weinstein
7e79a571fd Merge "Move the kptr_restrict setting from init.rc to init.cpp." am: c734a0a9ee
am: 776978788b

Change-Id: I7103cc643dc9159035beed90aacbb25e5d4908ce
2017-01-20 20:29:45 +00:00
Dave Weinstein
776978788b Merge "Move the kptr_restrict setting from init.rc to init.cpp."
am: c734a0a9ee

Change-Id: Ib8674efbe3d284da593186e8fc2f917e3ff8c077
2017-01-20 20:26:44 +00:00
Dave Weinstein
c734a0a9ee Merge "Move the kptr_restrict setting from init.rc to init.cpp." 2017-01-20 20:24:10 +00:00
Mark Salyzyn
212fc3349f Merge "logd: test: switch to /data/backup/ for sepolicy avc injection" am: d289e36847 am: 17fc5dad3b
am: 0eaa560c7a

Change-Id: I645ade89339100cd3a0da2bb722eb3dc84b3ba28
2017-01-20 19:49:10 +00:00
Mark Salyzyn
0eaa560c7a Merge "logd: test: switch to /data/backup/ for sepolicy avc injection" am: d289e36847
am: 17fc5dad3b

Change-Id: Ibc0cffb9f8df3d7bb8bc848e03cb1b0af588a446
2017-01-20 19:47:11 +00:00
Mark Salyzyn
17fc5dad3b Merge "logd: test: switch to /data/backup/ for sepolicy avc injection"
am: d289e36847

Change-Id: I80afddde7f550596135dd9549f22f55a95bd3081
2017-01-20 19:45:10 +00:00
Treehugger Robot
d289e36847 Merge "logd: test: switch to /data/backup/ for sepolicy avc injection" 2017-01-20 19:42:51 +00:00
James Hawkins
a51b165c7a bootstat: Remove debug logging of bootstat_mtime_matches_content.
Bug: 34507152
Test: bootstat_tests
Change-Id: I97f84dd04eb44e6a5d00cf9a2f6b24a5b3e9297f
2017-01-20 11:20:36 -08:00
Mark Salyzyn
6af998c52a Merge "liblog: BM_log_latency improvement" am: 9d3722be72 am: e79f85ca42
am: 0a604f123a

Change-Id: I1b08d2f4c8e434aa6720805eb7b7aaea8c07383d
2017-01-20 19:18:55 +00:00
Mark Salyzyn
0a604f123a Merge "liblog: BM_log_latency improvement" am: 9d3722be72
am: e79f85ca42

Change-Id: I3e76c334dfc5aa160ccce6e7a2d79ab331543690
2017-01-20 19:12:38 +00:00
Mark Salyzyn
e79f85ca42 Merge "liblog: BM_log_latency improvement"
am: 9d3722be72

Change-Id: I823a97f19fa9aee1c482c517da3541d70d97722d
2017-01-20 19:09:37 +00:00
Mark Salyzyn
9d3722be72 Merge "liblog: BM_log_latency improvement" 2017-01-20 19:04:54 +00:00
Mark Salyzyn
142b43d4ab liblog: BM_log_latency improvement
This reduces BM_log_latency from ~300ns to ~100ns.  Because, well, we
read the clock earlier and that is what BM_log_latency tries to
measure.  The one major improvement in the switch from kernel logger
to user space logger was that we picked up the timestamp in the
context of the caller before doing anything else, but alas changes
over time neglected this fact and placed isloggable checking ahead
of this important fact.

Test: liblog_benchmarks, check results
Change-Id: I4bc9fc3cf8b1659e88417d967b1d0f3743f9e456
2017-01-20 17:53:27 +00:00
Mark Salyzyn
c3c06294e5 logd: test: switch to /data/backup/ for sepolicy avc injection
Resolve issues seen on continuous testing frame:

- statistics test, info instead of fail on missing radio log data.
- sepolicy switch from /data/misc/logd/ to /data/backup/ as the
  directory we access(2) to inject sepolicy violations.  The key here
  is we are still root, but we are in u:r:shell:s0, and the directory
  does not provide us DAC access (0700 system system) so we trigger
  the pair dac_override and dac_read_search on every try to get past
  the message de-duper.  /data/misc/logd is not always there, until
  logpersist is enabled, but /data/backup is always there.
- a stricter signature of '): avc: denied'
- put in a looser threshold for sepolicy_rate_limiter_spam test.

Test: gTest logd-unit-tests --gtest_filter=logd.sepolicy*
Bug: 34454758
Change-Id: I28ce4fdb51dc4869944e3253b593ce222d16ec98
2017-01-20 09:42:02 -08:00
Dave Weinstein
44f7e4f421 Move the kptr_restrict setting from init.rc to init.cpp.
Also ensure that it uses the highest supported value, and
abort if the value is not above a minimum threshold.

Test: Tested against the curent kernel (maximum value of 2,
      set to 0 by the kernel initially) and against a
      modified kernel (maximum value of 4, set to 4 by the
      kernel initially)

Bug: 30368199
Change-Id: I608db577258b68b390ffe96f452e1f7c0bc9ad8a
2017-01-20 09:40:43 -08:00
Jaekyun Seok
f184d8bf47 Merge "Load default/build props from each partition" am: 8dbab358f0 am: 57337e7791
am: ac747ef65a

Change-Id: Ia409eb23d4ba86f42ddd25af31557bf1bb03e07f
2017-01-20 04:17:50 +00:00
Jaekyun Seok
ac747ef65a Merge "Load default/build props from each partition" am: 8dbab358f0
am: 57337e7791

Change-Id: I813ea48bf952b8fdf85c38e937019916f68df784
2017-01-20 04:05:58 +00:00
Jaekyun Seok
57337e7791 Merge "Load default/build props from each partition"
am: 8dbab358f0

Change-Id: Id2330e53018b7e9638383eda697db7550b1a8324
2017-01-20 04:02:20 +00:00
Treehugger Robot
8dbab358f0 Merge "Load default/build props from each partition" 2017-01-20 03:58:52 +00:00
George Burgess IV
728475056a Merge "Fix a call to openat with incorrect arguments" am: 18044da576 am: 5675b05f52
am: dca9c41a79

Change-Id: Ibfb8cf5508a19593379bce4b6626484757ddef5f
2017-01-20 00:22:42 +00:00
George Burgess IV
dca9c41a79 Merge "Fix a call to openat with incorrect arguments" am: 18044da576
am: 5675b05f52

Change-Id: I8e1952130cfa2110051abc5a8148e01e0525a1ac
2017-01-20 00:10:59 +00:00
George Burgess IV
5675b05f52 Merge "Fix a call to openat with incorrect arguments"
am: 18044da576

Change-Id: Ib2e858afb84ec87933ba34969b3fd8afb3814a0f
2017-01-20 00:05:29 +00:00
Treehugger Robot
18044da576 Merge "Fix a call to openat with incorrect arguments" 2017-01-19 23:58:22 +00:00
Paul Lawrence
237495615b Merge "Enable seccomp in init with generated policy" am: cfb8800e18 am: f029da5368
am: 578e344b71

Change-Id: I82b4408218232158aba1942f722c502a8367774c
2017-01-19 23:36:37 +00:00
Paul Lawrence
578e344b71 Merge "Enable seccomp in init with generated policy" am: cfb8800e18
am: f029da5368

Change-Id: I164f8ab4b253a9112f6978ab90f21b1f8af35644
2017-01-19 23:33:05 +00:00
Paul Lawrence
f029da5368 Merge "Enable seccomp in init with generated policy"
am: cfb8800e18

Change-Id: I5db39f788e643d299a92a2494873e10dec1d76fb
2017-01-19 23:30:33 +00:00
Treehugger Robot
cfb8800e18 Merge "Enable seccomp in init with generated policy" 2017-01-19 23:26:10 +00:00
George Burgess IV
7008c8484d Fix a call to openat with incorrect arguments
Caught by running clang-FORTIFY over Android.

Bug: None
Test: Builds
Change-Id: If138c4bbb7f5fb40bbb20e24adbb25a6ef1286ac
2017-01-19 13:33:52 -08:00
James Hawkins
db72e39137 bootstat: Fix false metrics due to soft reboots.
am: b7893e6fa4

Change-Id: Ib1f0cd348b10d7931d901a27727fc76b665c0abd
2017-01-19 21:12:45 +00:00
James Hawkins
b7893e6fa4 bootstat: Fix false metrics due to soft reboots.
Use a flag to enable/disable logging metrics, set to false during soft
reboots.

Bug: 32807863
Change-Id: Ib1359327af4e18d40400c29961c454f7be1b8d0c
Test: None
(cherry picked from commit 800ceb45b1)
2017-01-19 10:15:51 -08:00
Jeff Sharkey
b1e89ec14f Merge "Define GID range for external data and OBBs." am: 1e7cdf3c7d am: d150012349
am: 23b6547230

Change-Id: I3309e45435c80a2265685e456204faf73ed8fa36
2017-01-19 16:35:07 +00:00
Jeff Sharkey
23b6547230 Merge "Define GID range for external data and OBBs." am: 1e7cdf3c7d
am: d150012349

Change-Id: I623a5dc6f23bff66add042241dd9b47ed68f64bb
2017-01-19 16:31:09 +00:00
Jeff Sharkey
d150012349 Merge "Define GID range for external data and OBBs."
am: 1e7cdf3c7d

Change-Id: I14bab914f585c5d7ad95d63ceb3096981ee4f3a5
2017-01-19 16:23:57 +00:00
Jeff Sharkey
1e7cdf3c7d Merge "Define GID range for external data and OBBs." 2017-01-19 16:16:40 +00:00
Gustavo Padovan
be45fed787 Merge changes Icb8e6290,Iadde7b21,I743ab92c,Ie078fbc2,I2ab3cd46, ... am: c42bd0931f am: 519bf2c698
am: 63937c7676

Change-Id: Iaa1470d719e0bbf30c6aa14c64ea154cf5fac18f
2017-01-19 00:47:09 +00:00