Commit graph

12771 commits

Author SHA1 Message Date
Sami Tolvanen
891ea4c05e am 9c92cef4: am eb2ff9bb: am 8ee42f9c: Merge "Add init support for dm-verity logging mode"
* commit '9c92cef4480cdb463605b4ab39fbaeb586659aba':
  Add init support for dm-verity logging mode
2015-03-04 23:24:37 +00:00
Sami Tolvanen
c1dadc6327 am 1ae4f750: am 6904e0c2: am a88fb24a: Merge "Add fs_mgr support for dm-verity modes"
* commit '1ae4f7507241d1754a4806f3151c385d909343cd':
  Add fs_mgr support for dm-verity modes
2015-03-04 23:24:36 +00:00
Sami Tolvanen
9c92cef448 am eb2ff9bb: am 8ee42f9c: Merge "Add init support for dm-verity logging mode"
* commit 'eb2ff9bb1b92feed65a610564569ddae525c3517':
  Add init support for dm-verity logging mode
2015-03-04 22:51:32 +00:00
Sami Tolvanen
1ae4f75072 am 6904e0c2: am a88fb24a: Merge "Add fs_mgr support for dm-verity modes"
* commit '6904e0c263a02f08c9c6f555dceafa2cce467954':
  Add fs_mgr support for dm-verity modes
2015-03-04 22:51:31 +00:00
Sami Tolvanen
eb2ff9bb1b am 8ee42f9c: Merge "Add init support for dm-verity logging mode"
* commit '8ee42f9c50086830edb2cdf035ad5bedcf0fa6f1':
  Add init support for dm-verity logging mode
2015-03-04 22:44:38 +00:00
Sami Tolvanen
6904e0c263 am a88fb24a: Merge "Add fs_mgr support for dm-verity modes"
* commit 'a88fb24ab43eec9710a0d4d15aedb6d4bc51a2ec':
  Add fs_mgr support for dm-verity modes
2015-03-04 22:44:37 +00:00
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
Rom Lemarchand
38b340a52f Remove /proc/cpuinfo parsing
- Clean up the paths for ro.revision and ro.hardware parsing
- Use ro.hardwre in ueventd instead of parsing the kernel command line

Bug: 19366018
Change-Id: I018a293f3d46e736a8b65132b5b00b0f7c20edae
2015-02-27 19:09:59 -08:00
Sami Tolvanen
73bb196e35 am 3aa700e6: am 622d44d8: am fbb3f8ca: Merge "Set underlying block device RO when enabling verity"
* commit '3aa700e6857566290fdf42265091de9eb872ce35':
  Set underlying block device RO when enabling verity
2015-02-28 00:57:04 +00:00
Sami Tolvanen
3aa700e685 am 622d44d8: am fbb3f8ca: Merge "Set underlying block device RO when enabling verity"
* commit '622d44d86481295660534cd06a8b5914466acf29':
  Set underlying block device RO when enabling verity
2015-02-28 00:50:42 +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
8e6aea5c72 am 2f54e05b: am 5e14f416: am 6864e673: Merge "More SOCK_CLOEXEC"
* commit '2f54e05b36d0049b2db8694df978e9948444f7b1':
  More SOCK_CLOEXEC
2015-02-27 23:31:07 +00:00
Nick Kralevich
2f54e05b36 am 5e14f416: am 6864e673: Merge "More SOCK_CLOEXEC"
* commit '5e14f416afa412e49ebb07239e6e570c9405518d':
  More SOCK_CLOEXEC
2015-02-27 23:24:23 +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
87946e714b am 20dc9c01: am 1dd71ae1: am f33c3bc9: Merge "init: drop dontpanic & apanic initialization"
* commit '20dc9c01fabb33ed5a0e17b8efbdcdbe576c0941':
  init: drop dontpanic & apanic initialization
2015-02-27 19:44:46 +00:00
Mark Salyzyn
20dc9c01fa am 1dd71ae1: am f33c3bc9: Merge "init: drop dontpanic & apanic initialization"
* commit '1dd71ae12e2e47c9ca63eb04878ee9632cc4417c':
  init: drop dontpanic & apanic initialization
2015-02-27 19:39:44 +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
e6b0512efa am 68440e0d: am b8d1af61: am be971215: Merge "logcat: add pstore read"
* commit '68440e0dfeb47dd2bb9f4b51f67d5176ed120e20':
  logcat: add pstore read
2015-02-26 17:42:33 +00:00
Mark Salyzyn
75a2283d6b am 8c52e3b7: am d851c80f: am ae19b631: Merge "liblog: add pstore read"
* commit '8c52e3b79f8ca9ccef5d562f16a0c275f58b8538':
  liblog: add pstore read
2015-02-26 17:42:31 +00:00
Mark Salyzyn
68440e0dfe am b8d1af61: am be971215: Merge "logcat: add pstore read"
* commit 'b8d1af618d9b8486765933bda03f2e80c1166491':
  logcat: add pstore read
2015-02-26 17:35:43 +00:00
Mark Salyzyn
8c52e3b79f am d851c80f: am ae19b631: Merge "liblog: add pstore read"
* commit 'd851c80f0d99387c52725e019b20de727ca385d8':
  liblog: add pstore read
2015-02-26 17:35:42 +00: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
Nick Kralevich
5c09ad18dc am 3e8ebad0: am 3178c83a: am 895623e5: Merge "check if uid=0 before attempting remount"
* commit '3e8ebad058d584623c003c32895f0f9416cd36c3':
  check if uid=0 before attempting remount
2015-02-26 02:27:13 +00:00
Nick Kralevich
be95a75e6f am 0a316829: am 398ade81: am 7bb72b73: Merge "seclabel use on services out of system partition"
* commit '0a316829fb856f98d8db3ba78667feb19fb12e22':
  seclabel use on services out of system partition
2015-02-26 02:27:11 +00:00
Nick Kralevich
3e8ebad058 am 3178c83a: am 895623e5: Merge "check if uid=0 before attempting remount"
* commit '3178c83a02c7e0b1ee6f94c207f0d851f5baf7f2':
  check if uid=0 before attempting remount
2015-02-26 01:13:25 +00:00
Nick Kralevich
0a316829fb am 398ade81: am 7bb72b73: Merge "seclabel use on services out of system partition"
* commit '398ade817b64308cabbf10883ab5a74e4850e43d':
  seclabel use on services out of system partition
2015-02-26 01:13:24 +00: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
80783dea1d am f7690b03: am 15e625f7: am da261978: Merge "logcat: Add -D print dividers flag"
* commit 'f7690b03999b66e8c7a28f761d3ebf671239b5d6':
  logcat: Add -D print dividers flag
2015-02-25 23:52:43 +00:00
Mark Salyzyn
f7690b0399 am 15e625f7: am da261978: Merge "logcat: Add -D print dividers flag"
* commit '15e625f7dc24890603f30db5cdac75daf323a39d':
  logcat: Add -D print dividers flag
2015-02-25 23:48:54 +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
8d21303482 am 9206c1c2: am a100a2ef: am a2fc0f86: Merge "Test readx/writex (now renamed)."
* commit '9206c1c20b22e65a04b0b523bbef92ceb92d97ba':
  Test readx/writex (now renamed).
2015-02-25 23:32:45 +00:00