Commit Graph

29169 Commits

Author SHA1 Message Date
Michael Wright 95637eb2a3 Only allow system to write to existing input nodes.
This prevents the shell user from injecting input as if it were coming
from an existing input device, which in turn makes it easier for malware
/ abuse analysis to detect when someone is injecting input via the
command line vs a real user using a device.

Bug: 30861057
Test: ran getevent, saw correct output, played with device
Change-Id: Ib53eea1b7767f25510b5d36fe6109101a9fad8e0
2017-01-23 17:55:23 +00:00
Josh Gao 580c6b8cad Merge "adb: check for and report inotify_init1 failure." am: 41ee55a875 am: 95a3a2fc3d am: 22ce93df4a
am: b1d8b8811a

Change-Id: I6564aba9086bf98ced4251d4d3aac0824f232dad
2017-01-21 01:22:24 +00:00
Josh Gao b1d8b8811a Merge "adb: check for and report inotify_init1 failure." am: 41ee55a875 am: 95a3a2fc3d
am: 22ce93df4a

Change-Id: Id1264323d851f6f59f24d3a0dbc23eb5bccc4d8a
2017-01-21 01:17:36 +00:00
Josh Gao 22ce93df4a Merge "adb: check for and report inotify_init1 failure." am: 41ee55a875
am: 95a3a2fc3d

Change-Id: Ifa14af07b422a764fcf9204343090540eea51089
2017-01-21 01:13:35 +00:00
Josh Gao 95a3a2fc3d Merge "adb: check for and report inotify_init1 failure."
am: 41ee55a875

Change-Id: I5454f46e519aa7b9660f1ec98f445e6d820808e0
2017-01-21 01:10:05 +00:00
Treehugger Robot 41ee55a875 Merge "adb: check for and report inotify_init1 failure." 2017-01-21 01:05:02 +00:00
Josh Gao fb9a7e5995 adb: check for and report inotify_init1 failure.
Bug: http://b/34396687
Test: mma
Change-Id: I55ea84db49017a6533ac54db5072e3e75ba30097
2017-01-20 15:26:00 -08:00
Josh Gao 8c98938853 Merge "init: don't start tombstoned until /data is mounted." am: b479a5002e am: f83489c02c am: d7db8378d0
am: 5d6ea5a9bd

Change-Id: I5ad79b54f9f42e6b04d81ca8123e5b41b03e92fb
2017-01-20 22:27:44 +00:00
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 872e525973 Merge "bootstat: Remove debug logging of bootstat_mtime_matches_content." am: b5e530f720 am: cd39315a35 am: 450e389645
am: d8c97154b8

Change-Id: I332240ca5abd32471c9e29dcbba533530bc24f17
2017-01-20 21:59:46 +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 a6ed68b02c Merge "crash_dump: don't abort if we fail to attach a sibling." am: ac0403b1e5 am: 2bd9fa0612 am: 5e5a168453
am: 23b0923f7a

Change-Id: Idfe805a38d00172cfb717ab0e4be30ba277d791f
2017-01-20 21:20:32 +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
TreeHugger Robot 2acd818ebe Merge "Revert "Revert "storaged: assign to system-background cpuset""" 2017-01-20 20:43:07 +00:00
Dave Weinstein 4b499a1b13 Merge "Move the kptr_restrict setting from init.rc to init.cpp." am: c734a0a9ee am: 776978788b am: 7e79a571fd
am: a69b7ea3a4

Change-Id: Iabde07f1c50e62b5394386f5718ae5a3d40e7c3b
2017-01-20 20:34:40 +00: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 987059e988 Merge "logd: test: switch to /data/backup/ for sepolicy avc injection" am: d289e36847 am: 17fc5dad3b am: 0eaa560c7a
am: 212fc3349f

Change-Id: I3d0b151d3892b56db9f68a703021a9991c67c222
2017-01-20 19:52:30 +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
Mark Salyzyn 1a7d47940b Merge "liblog: BM_log_latency improvement" am: 9d3722be72 am: e79f85ca42 am: 0a604f123a
am: 6af998c52a

Change-Id: Ibdd1b29bfb2a6d8494bf635d01bf2c0f7a8c2a91
2017-01-20 19:26:48 +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
Jin Qian eabad63def Revert "Revert "storaged: assign to system-background cpuset""
This reverts commit b7ef979639.

Change-Id: Ib9478701c67dbddf2f76480ae6ca6e0a9145a778
2017-01-20 10:08:53 +00:00
Jin Qian eab5ee7e4f Merge "Revert "storaged: assign to system-background cpuset"" 2017-01-20 07:29:09 +00:00
Jin Qian b7ef979639 Revert "storaged: assign to system-background cpuset"
This reverts commit e1d4b072ff.

Change-Id: I6be0af0e85efff672ea95e9a05c33618cd994dd5
2017-01-20 07:23:48 +00:00
Jaekyun Seok 3e1bddf9dd Merge "Load default/build props from each partition" am: 8dbab358f0 am: 57337e7791 am: ac747ef65a
am: f184d8bf47

Change-Id: I867e61238287e2e76049ef65cfe408b03691c5eb
2017-01-20 05:40:43 +00: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