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
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
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
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
24c389a8bf
Merge "Fix a call to openat with incorrect arguments" am: 18044da576
am: 5675b05f52
am: dca9c41a79
...
am: 728475056a
Change-Id: I0f5fc711eb3ce6029ec54553e2e423f2c42f3445
2017-01-20 01:24:16 +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
8281d2533a
Merge "Enable seccomp in init with generated policy" am: cfb8800e18
am: f029da5368
am: 578e344b71
...
am: 237495615b
Change-Id: I835875c7409985da2ce97ed50dd9860ec41e68d9
2017-01-19 23:48:24 +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
3869b942de
bootstat: Fix false metrics due to soft reboots. am: b7893e6fa4
...
am: db72e39137
Change-Id: I9e2fc47b3252ef7cb0b3fbdeabba8dba4c37ebc3
2017-01-19 21:15:15 +00: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
84dc96227d
Merge "Define GID range for external data and OBBs." am: 1e7cdf3c7d
am: d150012349
am: 23b6547230
...
am: b1e89ec14f
Change-Id: If94a9fd76e895f922f8b5f6ed99b871b5febb3f9
2017-01-19 16:39:37 +00: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
0e5dd08e91
Merge changes Icb8e6290,Iadde7b21,I743ab92c,Ie078fbc2,I2ab3cd46, ... am: c42bd0931f
am: 519bf2c698
am: 63937c7676
...
am: be45fed787
Change-Id: I3f7eff2df8c02bd0d525a2c01d7993518ce3a7b2
2017-01-19 00:58:56 +00:00
Gustavo Padovan
ed57f926fa
libsync: tests: redefine PollOnDestroyedTimeline() am: 801492b8a6
am: 7b98240813
am: 6a33f58ae8
...
am: 34a97642a1
Change-Id: I0e4de28d8204c842bc2079bca1a0588842bf78fb
2017-01-19 00:58:49 +00:00
Gustavo Padovan
69f9c389ca
libsync: tests: remove WaitOnDestroyedTimeline test am: e4682802cb
am: 26df302b33
am: 9445716a09
...
am: 0c831fc9ed
Change-Id: I760fae98f5c6578364ddaac960f8619b576b6e15
2017-01-19 00:58:37 +00:00
Gustavo Padovan
b1d4f916b8
libsync: add support to new Sync API am: 61ab0d74d2
am: 8dc6cc921b
am: 4c33794e7d
...
am: 4bd5f18f8b
Change-Id: I06bff1f4847bea33d5776fd6f790ae4d95792ba6
2017-01-19 00:58:22 +00:00
Gustavo Padovan
26686e3df8
libsync: open new location of sw_sync file am: ffc687baad
am: 86be7fd517
am: e3c169301a
...
am: 5f89d525c5
Change-Id: Ie448b10cbe9b3ae8d6ccd1843c0b6f4249617e34
2017-01-19 00:58:14 +00:00
Gustavo Padovan
c31c0cbed2
libsync: add new Sync kernel API am: 6786575d42
am: f951c0d87a
am: f08b438edd
...
am: 7e4f09bbb4
Change-Id: If0c7dbbed8538ebf480909587f99fcdb550bc2fb
2017-01-19 00:58:06 +00:00