Commit Graph

12209 Commits

Author SHA1 Message Date
Sami Tolvanen 8ee42f9c50 Merge "Add init support for dm-verity logging mode" 2015-03-04 20:42:09 +00:00
Sami Tolvanen a88fb24ab4 Merge "Add fs_mgr support for dm-verity modes" 2015-03-04 20:41:49 +00:00
Sami Tolvanen 8ff0190835 Add init support for dm-verity logging mode
Add a built-in command for loading verity state. If dm-verity
will be started in logging mode, trigger verity-logging.

Needs changes from
  Ibb82953594d234f81ad21c40f524190b88e4ac8f

Change-Id: I5af4918f2f14fdd4d07f51c55837e08111fd3748
2015-03-04 03:07:47 +00:00
Sami Tolvanen 51bf11ad95 Add fs_mgr support for dm-verity modes
Add support for dm-verity modes and storing persistent state in
a location specified by the following properties:

  ro.verity.state.location
  ro.verity.state.offset

If these properties do not exist, dm-verity is always loaded in
EIO mode. If the properties do exist, but the location does not
have valid state data, dm-verity is loaded in RESTART mode. The
mode is updated to LOGGING if a dm-verity triggered restart has
occurred.

Change-Id: Ibb82953594d234f81ad21c40f524190b88e4ac8f
2015-03-04 03:07:35 +00:00
Sami Tolvanen 622d44d864 am fbb3f8ca: Merge "Set underlying block device RO when enabling verity"
* commit 'fbb3f8ca499b04c82437155f87c8666cad607c6b':
  Set underlying block device RO when enabling verity
2015-02-28 00:43:58 +00:00
Sami Tolvanen fbb3f8ca49 Merge "Set underlying block device RO when enabling verity" 2015-02-28 00:40:11 +00:00
Nick Kralevich 5e14f416af am 6864e673: Merge "More SOCK_CLOEXEC"
* commit '6864e6739027adf725ced33777d3e21f80a95479':
  More SOCK_CLOEXEC
2015-02-27 23:19:11 +00:00
Nick Kralevich 6864e67390 Merge "More SOCK_CLOEXEC" 2015-02-27 21:44:36 +00:00
Mark Salyzyn 1dd71ae12e am f33c3bc9: Merge "init: drop dontpanic & apanic initialization"
* commit 'f33c3bc9602e4a369c4cc5d28357b8f73a3eed6c':
  init: drop dontpanic & apanic initialization
2015-02-27 19:34:33 +00:00
Mark Salyzyn f33c3bc960 Merge "init: drop dontpanic & apanic initialization" 2015-02-27 19:28:52 +00:00
Mark Salyzyn 1eaba37aae init: drop dontpanic & apanic initialization
Bug: 19050686
Bug: 19525200
Change-Id: Id81abe3b44283b439390b42db7a9da23748dee0a
2015-02-27 07:03:01 -08:00
Sami Tolvanen 214f33b8c0 Set underlying block device RO when enabling verity
Currently, when verity is set up on a block device, the underlying
device is still accessible directly. Change the existing function
fs_set_blk_ro visible to other fs_mgr modules, change the behavior
to match the comment above the function definition, and call it to
disable write access to the block device when setting up verity.

Bug: 18609347
Change-Id: I7884175df15f9161174788d74d20a08e4cd472ca
2015-02-27 11:28:34 +00:00
Nick Kralevich 6d3cddb2e2 More SOCK_CLOEXEC
Change-Id: I3e18f34d08a6443aaf55d7c91c27867840ac1773
2015-02-26 13:32:52 -08:00
Mark Salyzyn b8d1af618d am be971215: Merge "logcat: add pstore read"
* commit 'be9712156bdcf8cff774a78a3afdb0c562998c73':
  logcat: add pstore read
2015-02-26 17:29:06 +00:00
Mark Salyzyn d851c80f0d am ae19b631: Merge "liblog: add pstore read"
* commit 'ae19b63168d1b958898180979156e2a4169ee4c2':
  liblog: add pstore read
2015-02-26 17:29:05 +00:00
Mark Salyzyn be9712156b Merge "logcat: add pstore read" 2015-02-26 17:23:24 +00:00
Mark Salyzyn ae19b63168 Merge "liblog: add pstore read" 2015-02-26 17:23:15 +00:00
Mark Salyzyn 7c975ac3a4 logcat: add pstore read
Used to pull the Android log messages after a reboot.
A companion to the pstore console logs. Adding the -L
flag triggers this behavior.

Change-Id: Icce2dc00bcbb26975bea604420c6be397869e804
2015-02-26 07:22:15 -08:00
Mark Salyzyn 6eef417119 liblog: add pstore read
Used to pull the Android log messages after a reboot. Adding
an ANDROID_LOG_PSTORE flag to the mode parameter in calls to
android_logger_list_alloc() and android_logger_list_alloc_time().
The side effects are that android_logger_clear() and
android_logger_list_read() will react with the user space
pstore driver. Forms a companion to the pstore console logs.

Change-Id: I7bb07b87b3bf73f059a21af3f810af37c7715b6d
2015-02-26 06:37:35 -08:00
Elliott Hughes 8d82ea05cb Implement exec.
Change-Id: I20329bc9b378479d745b498d6a00eca0872cd5ab
2015-02-25 17:55:34 -08:00
Nick Kralevich 3178c83a02 am 895623e5: Merge "check if uid=0 before attempting remount"
* commit '895623e5cafc35450bc6cef5f6d4ca7195c6b08c':
  check if uid=0 before attempting remount
2015-02-26 01:07:13 +00:00
Nick Kralevich 398ade817b am 7bb72b73: Merge "seclabel use on services out of system partition"
* commit '7bb72b73b0291636721d83a45adad175163361ec':
  seclabel use on services out of system partition
2015-02-26 01:07:12 +00:00
Nick Kralevich 895623e5ca Merge "check if uid=0 before attempting remount" 2015-02-26 00:28:43 +00:00
Nick Kralevich 268eb4f384 check if uid=0 before attempting remount
If "adb remount" is done without having done "adb root" first,
scary looking SELinux denials are emitted before the operation
eventually fails. Avoid the scary looking messages by refusing
remount attempts if we're not running with privileges.

Change-Id: I298621251a10e38345ef77875003a97c8b5a0270
2015-02-25 16:27:31 -08:00
Nick Kralevich 7bb72b73b0 Merge "seclabel use on services out of system partition" 2015-02-26 00:23:19 +00:00
Mark Salyzyn 15e625f7dc am da261978: Merge "logcat: Add -D print dividers flag"
* commit 'da26197873c97515d1e59137b8347667689ced42':
  logcat: Add -D print dividers flag
2015-02-25 23:42:42 +00:00
Mark Salyzyn da26197873 Merge "logcat: Add -D print dividers flag" 2015-02-25 23:34:47 +00:00
Dan Albert a100a2efd6 am a2fc0f86: Merge "Test readx/writex (now renamed)."
* commit 'a2fc0f86a1618fe9605a085c34ec7f088f0872f5':
  Test readx/writex (now renamed).
2015-02-25 23:17:54 +00:00
Dan Albert a2fc0f86a1 Merge "Test readx/writex (now renamed)." 2015-02-25 23:11:06 +00:00
Dan Albert cc731cc767 Test readx/writex (now renamed).
Renamed readx/writex to ReadFdExactly/WriteFdExactly respectively.
These read/write a full fixed-size buffer. If the whole buffer cannot
be read/written, these functions return an error.

Rename write_string to WriteStringFully.

Move the TEMP_FAILURE_RETRY definition in sysdeps.h out of the
!Windows section. It seems Windows won't actually interrupt a call,
but it's easier to just define it than to #ifdef each call.

Change-Id: Ia8ddffa2a52764a2f9a281c96c937660e002b9b9
2015-02-25 15:07:57 -08:00
Mark Salyzyn 7b30ff8d87 logcat: Add -D print dividers flag
Permits a single thread to collect several log buffer and
to separate them out into named buckets by keying off the
dividers ---------

Change-Id: I5a92c67383a73ea566cb9b9732d26d88d9c41c66
2015-02-25 23:03:40 +00:00
Dan Albert ac3bbfadb9 am a035d500: Merge "Remove _(GNU|XOPEN)_SOURCE makefile cruft."
* commit 'a035d5003ea593322ba565df9a4f4d0dd6647acf':
  Remove _(GNU|XOPEN)_SOURCE makefile cruft.
2015-02-25 19:18:32 +00:00
Dan Albert e4fe476e38 am 948ae1b9: Merge "Add some basic tests to adb."
* commit '948ae1b9353545119a89b6fb8fe8380d4039a366':
  Add some basic tests to adb.
2015-02-25 19:13:05 +00:00
Dan Albert a035d5003e Merge "Remove _(GNU|XOPEN)_SOURCE makefile cruft." 2015-02-25 19:11:14 +00:00
Dan Albert 7fd821e907 Remove _(GNU|XOPEN)_SOURCE makefile cruft.
None of the functions that require these are used.

Change-Id: I10cffab127795b94340131f8737f7924b9138f9e
2015-02-25 11:08:21 -08:00
Dan Albert 948ae1b935 Merge "Add some basic tests to adb." 2015-02-25 19:06:39 +00:00
Dan Albert 055f1aa4ff Add some basic tests to adb.
Change-Id: I946b5b1e5650540db3b4f75892214c4218b3baf3
2015-02-25 10:57:26 -08:00
Elliott Hughes 58b81bf81b am a82f2b25: Merge "Support "fastboot reboot bootloader"."
* commit 'a82f2b259076135017a2665bfbc3344826e9112f':
  Support "fastboot reboot bootloader".
2015-02-25 18:47:07 +00:00
Elliott Hughes a82f2b2590 Merge "Support "fastboot reboot bootloader"." 2015-02-25 18:43:04 +00:00
Dan Albert 186a38bc7b am d75d6c91: Merge "Fix the mac build."
* commit 'd75d6c91d24c071534ed36db85a1e72b33dc5a10':
  Fix the mac build.
2015-02-25 18:34:26 +00:00
Dan Albert d75d6c91d2 Merge "Fix the mac build." 2015-02-25 18:27:41 +00:00
Dan Albert dc0f8ecb24 Fix the mac build.
Change-Id: Ieb6f2650ce5f39f1d8c938d0ca8cbec459d8e2fd
2015-02-25 10:26:17 -08:00
Mark Salyzyn f5579498d9 am 110166c1: Merge "liblog: introduce ANDROID_LOG_* flags"
* commit '110166c1dbcbe26e510ac3fdaf2e1fcc7efbcc4e':
  liblog: introduce ANDROID_LOG_* flags
2015-02-25 18:12:48 +00:00
Mark Salyzyn 110166c1db Merge "liblog: introduce ANDROID_LOG_* flags" 2015-02-25 18:07:02 +00:00
Elliott Hughes ca85df0662 Support "fastboot reboot bootloader".
This matches the more general adb syntax, though the fastboot
protocol doesn't support rebooting into the recovery image.

Change-Id: I6d93d4c63d4a9b81c71e681e7a7bf76867fba019
2015-02-25 10:02:00 -08:00
Mark Salyzyn 2d3f38a6b8 liblog: introduce ANDROID_LOG_* flags
Move away from using POSIX open(2) flags and introduce ANDROID_LOG_* flags to
replace them. Add security by preventing random mode flags from getting into
underlying POSIX calls. ANDROID_LOG_* flags overlap POSIX O_* flag definitions.

Change-Id: Ib32bb64c287e8bf150be62242e1ba46bb37839fc
2015-02-25 17:44:18 +00:00
Dan Albert 16f3d361e1 am 72bf2a71: Merge "Move transport declarations into transport.h."
* commit '72bf2a710089b5fff42059d5946fe7bdd6b12480':
  Move transport declarations into transport.h.
2015-02-25 05:38:53 +00:00
Dan Albert 72bf2a7100 Merge "Move transport declarations into transport.h." 2015-02-25 05:33:35 +00:00
Dan Albert 7664901a35 Move transport declarations into transport.h.
There are a few cloexec issues in here as an added bonus.

Change-Id: I1699d719d733f47878bdba0454230cf5ab6a60b6
2015-02-24 21:30:22 -08:00
Dan Albert 01eed2187c am f5f9dd57: Merge "Add .clang-format file."
* commit 'f5f9dd572164d1b9cbd80b1b29cd8c42806ac715':
  Add .clang-format file.
2015-02-25 02:11:51 +00:00