Commit Graph

27198 Commits

Author SHA1 Message Date
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 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 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 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 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 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 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 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
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 63937c7676 Merge changes Icb8e6290,Iadde7b21,I743ab92c,Ie078fbc2,I2ab3cd46, ... am: c42bd0931f
am: 519bf2c698

Change-Id: I78f60929628d055937ca9fc8f4f4a6fe2f41206e
2017-01-19 00:44:29 +00:00
Gustavo Padovan 6a33f58ae8 libsync: tests: redefine PollOnDestroyedTimeline() am: 801492b8a6
am: 7b98240813

Change-Id: I21e0e3f2fbd6d87a7b654b9415cd4694bac60b0c
2017-01-19 00:44:24 +00:00
Gustavo Padovan 9445716a09 libsync: tests: remove WaitOnDestroyedTimeline test am: e4682802cb
am: 26df302b33

Change-Id: I691b9624e3699303c4ecdfe9efaa473a301d229e
2017-01-19 00:44:19 +00:00
Gustavo Padovan 4c33794e7d libsync: add support to new Sync API am: 61ab0d74d2
am: 8dc6cc921b

Change-Id: I4bb9422b8bc24f70ff254c9dd18ef188db78f4b9
2017-01-19 00:44:14 +00:00
Gustavo Padovan e3c169301a libsync: open new location of sw_sync file am: ffc687baad
am: 86be7fd517

Change-Id: Ibb1067f0d91c1a7c54263251b458b1f25a14112f
2017-01-19 00:44:09 +00:00
Gustavo Padovan f08b438edd libsync: add new Sync kernel API am: 6786575d42
am: f951c0d87a

Change-Id: I6410ddc83d7783106e0816d3b40a873ccb26a334
2017-01-19 00:44:03 +00:00
Gustavo Padovan ad74f8fe01 libsync: move kernel headers for sync ioctls to sync.h am: d6bbc5de66
am: 0d7e19b894

Change-Id: Iefbb7dc37ac100195b698f6b1dbf7e8137845a0c
2017-01-19 00:43:57 +00:00
Gustavo Padovan 519bf2c698 Merge changes Icb8e6290,Iadde7b21,I743ab92c,Ie078fbc2,I2ab3cd46, ...
am: c42bd0931f

Change-Id: Ic0a59fafc040e778bfce3af97326b090ac8d59d0
2017-01-19 00:42:21 +00:00
Gustavo Padovan 7b98240813 libsync: tests: redefine PollOnDestroyedTimeline()
am: 801492b8a6

Change-Id: I1e75acee45764fa6a3c246edfad544a682fa20bd
2017-01-19 00:42:20 +00:00
Gustavo Padovan 26df302b33 libsync: tests: remove WaitOnDestroyedTimeline test
am: e4682802cb

Change-Id: I75539a0eb3813b90ff2cc034ac719c162721783f
2017-01-19 00:42:15 +00:00
Gustavo Padovan 8dc6cc921b libsync: add support to new Sync API
am: 61ab0d74d2

Change-Id: I403d73c6c13cd15c11df1d59172b0cd9f74bf3a7
2017-01-19 00:42:11 +00:00
Gustavo Padovan 86be7fd517 libsync: open new location of sw_sync file
am: ffc687baad

Change-Id: I8da84e3bee0d805f36fcd6977bf6f2a60d500e6e
2017-01-19 00:42:07 +00:00
Gustavo Padovan f951c0d87a libsync: add new Sync kernel API
am: 6786575d42

Change-Id: Id7fe3249a907ea89307aa94735d9ebac8fc00e30
2017-01-19 00:42:02 +00:00
Gustavo Padovan 0d7e19b894 libsync: move kernel headers for sync ioctls to sync.h
am: d6bbc5de66

Change-Id: I542516c8c714a9484926105a1dc8d12ad3f28b76
2017-01-19 00:41:58 +00:00
Treehugger Robot c42bd0931f Merge changes Icb8e6290,Iadde7b21,I743ab92c,Ie078fbc2,I2ab3cd46, ...
* changes:
  libsync: tests: redefine PollOnDestroyedTimeline()
  libsync: tests: remove WaitOnDestroyedTimeline test
  libsync: add support to new Sync API
  libsync: open new location of sw_sync file
  libsync: add new Sync kernel API
  libsync: move kernel headers for sync ioctls to sync.h
2017-01-19 00:39:36 +00:00
Jeff Sharkey 7e5d0b1fae Define GID range for external data and OBBs.
To quickly answer the question of "how much data is a UID using?" we
need a GID range to label files on external storage, similar to
the GID ranges already defined for cached and shared data.

Also define a new GID that will be used to label the OBB files shared
between all users under /data/media/obb.

Test: builds, newly added tests pass
Bug: 34263266
Change-Id: I16fb7d166c3dcdeafbf477162d191d3b73ae8ac2
2017-01-18 17:11:05 -07:00
Josh Gao 787f1b29d0 Merge "debuggerd: advance our amazing bet." am: 230201dcbf
am: 11b938e881

Change-Id: I75cc5a38654b98a41edd2951e807eb5dabdc8815
2017-01-18 23:46:02 +00:00