Commit graph

13373 commits

Author SHA1 Message Date
Elliott Hughes
11e6f219e7 am 21ba889a: Merge "Ignore ro.adb.secure in user builds."
* commit '21ba889aded6167859c88f51dec54838b8e407a1':
  Ignore ro.adb.secure in user builds.
2015-06-19 20:36:46 +00:00
Elliott Hughes
21ba889ade Merge "Ignore ro.adb.secure in user builds." 2015-06-19 20:24:19 +00:00
Nick Kralevich
8d855ba983 am d2e7f002: Merge "init/util.cpp: don\'t return a negative unsigned value"
* commit 'd2e7f0021dbf3f1f301f1e268820952c8a80f2e3':
  init/util.cpp: don't return a negative unsigned value
2015-06-19 03:34:09 +00:00
Nick Kralevich
d2e7f0021d Merge "init/util.cpp: don't return a negative unsigned value" 2015-06-19 03:24:17 +00:00
Nick Kralevich
d2104df69b init/util.cpp: don't return a negative unsigned value
android_name_to_id() returns -1U on error, which causes a
crash when the following clang options are enabled:

  -fsanitize=signed-integer-overflow,unsigned-integer-overflow
  -ftrap-function=abort
  -fsanitize-undefined-trap-on-error

Rather than returning a negative unsigned value (which doesn't
make a lot of sense, IMHO), return a positive unsigned value.

While we're here, add logging on decode_uid failures.

Bug: 21880301
Change-Id: I652e4c1daa07c7494cceca2b4e1656b9158f2604
2015-06-18 20:11:06 -07:00
Elliott Hughes
5cba504215 Ignore ro.adb.secure in user builds.
Require authorization by default, and remove the ability to override
that in user builds. (userdebug and eng are still free to do whatever
they want.)

Bug: http://b/21862859
Change-Id: Ibf8af375be5bf1141c1ad481eee7a59fb10a7adb
2015-06-18 10:19:30 -07:00
Elliott Hughes
f5a7ba9eed am 53d504f0: Merge "init support for cgroups."
* commit '53d504f00dea232601e1290c8255274afb0f4256':
  init support for cgroups.
2015-06-17 22:31:21 +00:00
Elliott Hughes
53d504f00d Merge "init support for cgroups." 2015-06-17 22:20:38 +00:00
Elliott Hughes
d62f0608d9 init support for cgroups.
This adds the "writepid" option that instructs init to write the child's
pid to the given filenames (such as /dev/cpuctl/bg_non_interactive/cgroup.procs
and/or /dev/cpuset/foreground/cgroup.procs).

Bug: http://b/21163745
Change-Id: I121bb22aa208bc99c4fb334eb552fdd5bcc47c1a
2015-06-17 14:42:40 -07:00
Nick Kralevich
4c6269ce28 am 106f92f5: Merge "Revert "init: Enable LOCAL_DETECT_INTEGER_OVERFLOWS""
* commit '106f92f5c8f116acf8ba01090aab30ad57d0fed8':
  Revert "init: Enable LOCAL_DETECT_INTEGER_OVERFLOWS"
2015-06-16 23:56:34 +00:00
Nick Kralevich
106f92f5c8 Merge "Revert "init: Enable LOCAL_DETECT_INTEGER_OVERFLOWS"" 2015-06-16 23:47:39 +00:00
Nick Kralevich
21d605eff5 Revert "init: Enable LOCAL_DETECT_INTEGER_OVERFLOWS"
Shamu boots, but hammerhead doesn't. Likely cause is this change.

This reverts commit 18ae44bf3d.

Bug: 21880301
Change-Id: I490816060209c15aa07c783d05fe5b141c7c9023
2015-06-16 23:35:37 +00:00
Nick Kralevich
135b6b08cd am 6b27b7d6: Merge "init: Enable LOCAL_DETECT_INTEGER_OVERFLOWS"
* commit '6b27b7d60850433d1d6a3395f9569ea0f5f78634':
  init: Enable LOCAL_DETECT_INTEGER_OVERFLOWS
2015-06-16 20:44:43 +00:00
Nick Kralevich
6b27b7d608 Merge "init: Enable LOCAL_DETECT_INTEGER_OVERFLOWS" 2015-06-16 20:36:49 +00:00
Nick Kralevich
18ae44bf3d init: Enable LOCAL_DETECT_INTEGER_OVERFLOWS
Call abort() if an integer overflow or underflow occurs.
See https://android-review.googlesource.com/154831

Change-Id: Icb6bdef55a5899144351b56d683f34f5da32a88d
2015-06-15 20:37:09 -07:00
Mark Salyzyn
4c62736a5d am 3a7d4b4e: Merge "logd: missing klogd content"
* commit '3a7d4b4e2a4c221eacc2826c3261894bbb5faba2':
  logd: missing klogd content
2015-06-15 21:32:41 +00:00
Mark Salyzyn
3a7d4b4e2a Merge "logd: missing klogd content" 2015-06-15 21:20:47 +00:00
Mark Salyzyn
ee49c6a670 logd: missing klogd content
- regression in log_strtok_r (part deux) In commit
      'logd: fix kernel logline stutter'
  2c3b300fd8 we introduced log_strtok_r.
  as a replacement for strtok_r that dealt with a problem with
  some kernel log messages. Fix is to refine definition of
  is_timestamp to not match on patterns like [0], requiring
  a single period. Another fix is to refine definition of
  is_prio to properly escape non-digit content.
- Missing content because SYSLOG_ACTION_SIZE_BUFFER with added logging
  is too short for full read of SYSLOG_ACTION_READ_ALL dropping
  initial content. Add a margin for additional 1024 bytes.
- Absolute _first_ log entry has sequence number of 1, which is
  specifically dropped, start sequence count at 1 rather than 0.
- Remove trailing space for efficiency.
- If tag exists but no content, trick into kernel logging.

Bug: 21851884
Change-Id: I0867a555a3bca09bbf18d18e75e41dffffe57a23
2015-06-15 21:19:10 +00:00
Nick Kralevich
cb2d0c5aad am 7015b3be: Merge "TypeHelpers.h: Don\'t underflow unsigned int"
* commit '7015b3be5392043ca32f05aa51631dbec0a058d5':
  TypeHelpers.h: Don't underflow unsigned int
2015-06-15 17:38:38 +00:00
Nick Kralevich
7015b3be53 Merge "TypeHelpers.h: Don't underflow unsigned int" 2015-06-15 17:30:38 +00:00
Mark Salyzyn
4a3380f151 am c36c63c6: Merge "logd: filter on __android_log_is_loggable"
* commit 'c36c63c64556ced42597f255def5e8989868642b':
  logd: filter on __android_log_is_loggable
2015-06-15 14:47:26 +00:00
Mark Salyzyn
c36c63c645 Merge "logd: filter on __android_log_is_loggable" 2015-06-15 14:38:06 +00:00
Mark Salyzyn
e89360ddce am 87e16036: Merge "liblog: __android_log_is_loggable support global properties"
* commit '87e16036ec0521d20081ebec906d637c3b524f23':
  liblog: __android_log_is_loggable support global properties
2015-06-15 14:35:51 +00:00
Ben Cheng
87678797aa am 83be2fd7: Merge "Compare two bootcharts and list timestamps for selected processes."
* commit '83be2fd7b65734e410583506f4bd19981966577b':
  Compare two bootcharts and list timestamps for selected processes.
2015-06-15 14:35:50 +00:00
Mark Salyzyn
87e16036ec Merge "liblog: __android_log_is_loggable support global properties" 2015-06-15 14:32:20 +00:00
Ben Cheng
83be2fd7b6 Merge "Compare two bootcharts and list timestamps for selected processes." 2015-06-15 14:27:01 +00:00
Ben Cheng
50bbde0e60 Compare two bootcharts and list timestamps for selected processes.
Usage: system/core/init/compare-bootcharts.py base_bootchart_dir
       exp_bootchart_dir

For example, here is the output where the bootanimation is changed
from "d 0 0 part2" to "c 0 0 part2":

--

process: baseline experiment (delta)
 - Unit is ms (a jiffy is 10 ms on the system)
------------------------------------
/init: 50 40 (-10)
/system/bin/surfaceflinger: 4320 4470 (+150)
/system/bin/bootanimation: 6980 6990 (+10)
zygote64: 10410 10640 (+230)
zygote: 10410 10640 (+230)
system_server: 15350 15150 (-200)
bootanimation ends at: 33790 31230 (-2560)

--

In this example bootanimation is finished (estimated) 2.56 seconds sooner.

Change-Id: I39d59897c8c53d7d662676813e884b9d58feec3c
2015-06-15 15:57:02 +08:00
Nick Kralevich
58bf572aa2 TypeHelpers.h: Don't underflow unsigned int
When decrementing "n", eventually n will equal zero. When that
happens, n-- underflows. This causes a crash when code which uses
clang's -fsanitize=unsigned-integer-overflow is run.

Avoid trigging an unsigned integer underflow.

Change-Id: I9705be6580d61a164ef5fb1ec77e98a69d888438
2015-06-13 17:49:24 -07:00
Nick Kralevich
a27dca0f7a am 60c5a460: Merge "Remove calls to is_selinux_enabled()"
* commit '60c5a460c1906e52717afde1dc38630b30fc564e':
  Remove calls to is_selinux_enabled()
2015-06-13 10:19:20 +00:00
Nick Kralevich
60c5a460c1 Merge "Remove calls to is_selinux_enabled()" 2015-06-13 10:11:20 +00:00
Christopher Ferris
826e32edcb am de3bf277: Merge "Remove PtraceRead error message."
* commit 'de3bf277196e2a896ede3a5d81d92d394544616c':
  Remove PtraceRead error message.
2015-06-13 06:36:01 +00:00
Christopher Ferris
de3bf27719 Merge "Remove PtraceRead error message." 2015-06-13 06:27:30 +00:00
Christopher Ferris
35c8136d96 Remove PtraceRead error message.
This error message has no meaning and makes it look like an unwinding
failure occurred. These messages are showing up more often now
that a lot more of debuggerd is using the ReadWord and Read calls.

If a higher level function wants to indicate there is an error, then
it can add a more meaningful error.

Bug: 21818730
Change-Id: I83aca9cf241aee99e7425059b1b6e0d229c08a5e
2015-06-12 23:03:22 -07:00
Nick Kralevich
4d87095ebf Remove calls to is_selinux_enabled()
d34e407aeb removed support for
running with SELinux completely disabled. SELinux must either be
in permissive or enforcing mode now.

Remove unnecessary calls to is_selinux_enabled(). It always returns
true now.

Change-Id: Ife3156b74b13b2e590afe4accf716fc7776567e5
2015-06-12 22:12:33 -07:00
Mark Salyzyn
643f3c2fbf am 555d9198: Merge "Revert "logd: regression in log_strtok_r""
* commit '555d91985d174217c3e805997bcd86d9c94f5a6b':
  Revert "logd: regression in log_strtok_r"
2015-06-12 22:43:09 +00:00
Mark Salyzyn
363963d613 am de42d34c: Merge "logd: regression in log_strtok_r"
* commit 'de42d34cd5de2ca3ecc89b155ea866e98a5d5568':
  logd: regression in log_strtok_r
2015-06-12 22:43:08 +00:00
Mark Salyzyn
555d91985d Merge "Revert "logd: regression in log_strtok_r"" 2015-06-12 22:37:22 +00:00
Mark Salyzyn
4fb24dda34 Revert "logd: regression in log_strtok_r"
This reverts commit d3c5093a3c.

Change-Id: I52558fd0e9f75ba1cc6a151785fc91857c27ab9a
2015-06-12 22:36:57 +00:00
Mark Salyzyn
de42d34cd5 Merge "logd: regression in log_strtok_r" 2015-06-12 22:33:11 +00:00
Mark Salyzyn
d3c5093a3c logd: regression in log_strtok_r
In commit 'logd: fix kernel logline stutter'
2c3b300fd8 we introduced log_strtok_r.
as a replacement for strtok_r that dealt with a problem with
some kernel log messages. Fix is to refine definition of
is_timestamp to not match on patterns like [0].

Change-Id: I0867a555a3bca09bbf18d18e75e41dffffe57a22
2015-06-12 22:21:44 +00:00
Elliott Hughes
dc5993b3ba am 4931ae54: Merge "Minor "adb help" fixes."
* commit '4931ae545a59b595af718bf16e2280f69b62ca2f':
  Minor "adb help" fixes.
2015-06-12 21:57:51 +00:00
Elliott Hughes
4931ae545a Merge "Minor "adb help" fixes." 2015-06-12 21:45:12 +00:00
Evgenii Stepanov
3c90808d6d am c1c7f457: Merge "Add a space before :=."
* commit 'c1c7f457d773645ba67549ea931ba80fa09dddc5':
  Add a space before :=.
2015-06-12 21:38:54 +00:00
Evgenii Stepanov
a81970737a am 1d2567eb: Merge "Fix SANITIZE_TARGET build of liblog."
* commit '1d2567eb7ca3ef449a6272fa45533b56d337fe6b':
  Fix SANITIZE_TARGET build of liblog.
2015-06-12 21:38:52 +00:00
Elliott Hughes
7e067cff7a Minor "adb help" fixes.
One day we should slim this down. (Maybe implement the "help" versus
"help all" distinction that doesn't currently exist but was documented
before this change.)

Bug: https://code.google.com/p/android/issues/detail?id=158394
Change-Id: Ie24b588ffea00d262ce7ab0e5c328120ba8af240
2015-06-12 14:33:17 -07:00
Evgenii Stepanov
c1c7f457d7 Merge "Add a space before :=." 2015-06-12 21:31:27 +00:00
Evgenii Stepanov
1d2567eb7c Merge "Fix SANITIZE_TARGET build of liblog." 2015-06-12 21:31:00 +00:00
Evgenii Stepanov
6aaf740834 Add a space before :=.
Change-Id: Ib1d94648cdc163675ac7b6acf86408d5be6b5ad2
2015-06-12 14:18:33 -07:00
Evgenii Stepanov
c744ef5547 Fix SANITIZE_TARGET build of liblog.
* liblog does not use STL, don't link it.
* ASan runtime library depends on liblog, hence liblog can never be
  sanitized.

Bug: 21785137
Change-Id: I1e97378c61d4d18d740287f5f0881427aa7cc227
2015-06-12 14:18:33 -07:00
Mark Salyzyn
e59c469fa8 logd: filter on __android_log_is_loggable
- Default level when not specified is ANDROID_LOG_VERBOSE
  which is inert.

Bug: 20416721
Bug: 19544788
Bug: 17760225
Change-Id: Icc098e53dc47ceaaeb24ec42eb6f61d6430ec2f6
2015-06-12 10:35:09 -07:00