Commit graph

894 commits

Author SHA1 Message Date
Paul Lawrence
b2292f0a2c am c78c71b1: (-s ours) DO NOT MERGE Check password is correct by checking hash
* commit 'c78c71b1717613a5be921bbb8ac63c007d4af86a':
  DO NOT MERGE Check password is correct by checking hash
2015-06-01 15:38:09 +00:00
Paul Lawrence
145fc84a79 am fd7db732: (-s ours) DO NOT MERGE New ext4enc kernel switching from xattrs to ioctl
* commit 'fd7db732434eb41fda69a353053bcb7aab259529':
  DO NOT MERGE New ext4enc kernel switching from xattrs to ioctl
2015-06-01 15:28:39 +00:00
Paul Lawrence
d4618a5981 am 731a7a24: (-s ours) DO NOT MERGE Securely encrypt the master key
* commit '731a7a242df6cc3441ac82b4f9521546fac5ac2d':
  DO NOT MERGE Securely encrypt the master key
2015-06-01 15:28:39 +00:00
Paul Lawrence
c78c71b171 DO NOT MERGE Check password is correct by checking hash
(cherry-picked from commit 3ca21e227a)

Handle failures gracefully

Change-Id: Ifb6da8c11a86c50fb11964c18cc1be1326461f78
2015-05-29 14:13:50 -07:00
Paul Lawrence
fd7db73243 DO NOT MERGE New ext4enc kernel switching from xattrs to ioctl
(cherrypicked from commit 5e7f004231)

This is one of three changes to enable this functionality:
  https://android-review.googlesource.com/#/c/146259/
  https://android-review.googlesource.com/#/c/146264/
  https://android-review.googlesource.com/#/c/146265/

Bug: 18151196

Change-Id: Iba5146b8be1e15050ae901e08b3aaa26d96dcf7e
2015-05-29 17:50:43 +00:00
Paul Lawrence
731a7a242d DO NOT MERGE Securely encrypt the master key
(cherry-picked from commit 707fd6c7cc)

Move all key management into vold
Reuse vold's existing key management through the crypto footer
to manage the device wide keys.

Use ro.crypto.type flag to determine crypto type, which prevents
any issues when running in block encrypted mode, as well as speeding
up boot in block or no encryption.

This is one of four changes to enable this functionality:
  https://android-review.googlesource.com/#/c/148586/
  https://android-review.googlesource.com/#/c/148604/
  https://android-review.googlesource.com/#/c/148606/
  https://android-review.googlesource.com/#/c/148607/

Bug: 18151196

Change-Id: I3c68691717a61b5e1df76423ca0c02baff0dab98
2015-05-29 17:25:54 +00:00
Jeff Sharkey
a9ae06f092 am 65427f1a: Offer debug flag to force default primary.
* commit '65427f1a805ed2b8ee65a30ecf6ea8b14fe1e02b':
  Offer debug flag to force default primary.
2015-05-20 00:24:56 +00:00
Jeff Sharkey
65427f1a80 Offer debug flag to force default primary.
Useful for transforming a secondary SD card slot into a primary SD
card slot without doing a completely different lunch target.

$ adb shell stop
$ adb shell setprop vold.debug.default_primary 1
$ adb shell setprop ro.vold.primary_physical 1
$ adb shell setprop ctl.restart vold
$ adb shell start

Bug: 21017105
Change-Id: I45aac7ab3bb4c5ac3e0140572844883823fc3e4f
2015-05-19 15:54:15 -07:00
Jeff Sharkey
6e9e89f787 am 721e5807: Fully sync filesystem before time measurements.
* commit '721e5807ed28c7630c0359212cdc0544a9918aa1':
  Fully sync filesystem before time measurements.
2015-05-19 22:51:16 +00:00
Jeff Sharkey
721e5807ed Fully sync filesystem before time measurements.
Also drop unneeded SCR register logging.

Bug: 21172095
Change-Id: I17c5aae2edc0eb7144ab38701f90a1fd54e119da
2015-05-19 11:20:48 -07:00
Elliott Hughes
817409c3d9 am 4351c9a0: Merge "Don\'t use TEMP_FAILURE_RETRY on close in vold." into mnc-dev
* commit '4351c9a08be1d95607e2e5d431692198d60b7d94':
  Don't use TEMP_FAILURE_RETRY on close in vold.
2015-05-16 03:03:46 +00:00
Elliott Hughes
4351c9a08b Merge "Don't use TEMP_FAILURE_RETRY on close in vold." into mnc-dev 2015-05-16 02:42:31 +00:00
Elliott Hughes
a623108ef4 Don't use TEMP_FAILURE_RETRY on close in vold.
Bug: http://b/20501816
Change-Id: Ieecce9304539c250ed1728252b8c2c09d29afd7f
2015-05-15 18:34:24 -07:00
Jeff Sharkey
ddd4da1af6 am 5a6bfca1: Initial pass at storage benchmarks.
* commit '5a6bfca1638760b87cf64c5ffb48ff3557cc0563':
  Initial pass at storage benchmarks.
2015-05-15 22:22:33 +00:00
Jeff Sharkey
5a6bfca163 Initial pass at storage benchmarks.
Now that we're offering to store private app data on adopted storage
devices, the performance of those devices is much more important to
overall user experience.

To help set user expectations, this change offers to execute a
real-world benchmark on a storage device, returning a metric that can
be used to compare internal and external storage.  The benchmark is
generated from the strace-instrumented storage access patterns of
typical apps.

A typical device completes the benchmark in under two seconds on
internal storage, a UHS-3 SD card is even faster (!), but a very slow
Class 4 SD card takes about 30 seconds to complete, giving us a clear
signal.

The measured benchmark numbers are logged along with information
about the storage device, such as manufacturer, model, etc.  Card
serial numbers are scrubbed from output.

Bug: 21172095
Change-Id: I9b2713dafdfdfcf5d97bf1bc21841f39409a7e54
2015-05-15 10:48:11 -07:00
Jeff Sharkey
baf17b6acb am e44a41a1: Communicate if we have adoptable disks.
* commit 'e44a41a17b5c2d488442d7805b08231f4b327aca':
  Communicate if we have adoptable disks.
2015-05-13 21:19:18 +00:00
Jeff Sharkey
e44a41a17b Communicate if we have adoptable disks.
Bug: 19993667
Change-Id: I3c3dddab157a11038f7160d24d53e728bde2194f
2015-05-13 13:53:07 -07:00
Jeff Sharkey
da7bc8a5f9 am 8d15cb98: Report internal path for public volumes.
* commit '8d15cb9828f89709243b33c610b429694788c05d':
  Report internal path for public volumes.
2015-05-13 19:58:49 +00:00
Jeff Sharkey
8d15cb9828 Report internal path for public volumes.
Used by framework to bypass FUSE daemon overhead in some cases.

Bug: 21017105
Change-Id: I2f3ae70607417fc4cd2c970cb17cf3afa2f42613
2015-05-13 12:36:48 -07:00
Kenny Root
e05aacfec6 resolved conflicts for merge of 9df68a13 to mnc-dev-plus-aosp
Change-Id: I5c72c27ec055195d84c58d0699b46d3942c29dde
2015-05-13 09:36:52 -07:00
Paul Crowley
7239b92949 am eb0c05ce: Merge "Break key installation into its own function so we can install non-master keys."
* commit 'eb0c05ced4264f095b309b17f56babf49b3696dd':
  Break key installation into its own function so we can install non-master keys.
2015-05-13 15:21:43 +00:00
Paul Crowley
9df68a1364 Merge "Add vold commands for setting up per-user encrypted user directories" 2015-05-13 09:20:22 +00:00
Paul Crowley
75a5202d9f Add vold commands for setting up per-user encrypted user
directories

Bug: 19704432
Change-Id: I15980eed8e4960ca270cf0f8db4e480a8c2ca832
2015-05-13 10:17:14 +01:00
Paul Crowley
eb0c05ced4 Merge "Break key installation into its own function so we can install non-master keys." 2015-05-12 12:59:56 +00:00
Paul Crowley
1da96dc549 Break key installation into its own function so we can install
non-master keys.

Bug: 19704432
Change-Id: I5050d0e79c37f2a1366260e3f892d5b59e77b14b
2015-05-11 10:34:38 +01:00
Paul Lawrence
cb2a94ac76 am 86ddbbf4: Merge "Delete password as per block encryption"
* commit '86ddbbf4143daa721b84f0f253022d19d61b6fe3':
  Delete password as per block encryption
2015-05-07 16:16:12 +00:00
Paul Lawrence
86ddbbf414 Merge "Delete password as per block encryption" 2015-05-07 15:26:35 +00:00
Paul Crowley
4f817d1bd2 am 42696d97: Merge "Make vdc a C++ file as a base for further improvement."
* commit '42696d97ce138fa5e7a1380b3841250549acb615':
  Make vdc a C++ file as a base for further improvement.
2015-05-06 23:48:01 +00:00
Paul Lawrence
855f78c29b am eae7fc77: Merge "Fix problem that reading/writing crypto footers wasn\'t identity"
* commit 'eae7fc77b60962c9384b31e0f98d14724731ce88':
  Fix problem that reading/writing crypto footers wasn't identity
2015-05-06 23:47:54 +00:00
Paul Lawrence
823caaf761 am b32ebf30: Merge "Retry unmounts in ext4 encryption"
* commit 'b32ebf308a95ffa937d9b9a36417cdea70add0e5':
  Retry unmounts in ext4 encryption
2015-05-06 23:47:54 +00:00
Paul Lawrence
621d12e7e3 am 4571383c: Merge "Use default key permissions for ext4enc"
* commit '4571383cbf711df21d99529448277966e7ffb11e':
  Use default key permissions for ext4enc
2015-05-06 22:45:32 +00:00
Paul Lawrence
7edb3c761a am 0f29aec5: Merge "Simplify password checking logic"
* commit '0f29aec5af81083a558eeae7ec348b4f4fa9fb0e':
  Simplify password checking logic
2015-05-06 22:44:59 +00:00
Paul Lawrence
00f4aade5c Delete password as per block encryption
Bug: 18151196
Change-Id: Iee0f932c61ff4a309dc2861725b24bf976adb4c7
2015-05-06 13:56:16 -07:00
Paul Crowley
42696d97ce Merge "Make vdc a C++ file as a base for further improvement." 2015-05-06 15:57:12 +00:00
Paul Lawrence
eae7fc77b6 Merge "Fix problem that reading/writing crypto footers wasn't identity" 2015-05-06 14:08:25 +00:00
Paul Lawrence
b32ebf308a Merge "Retry unmounts in ext4 encryption" 2015-05-06 14:08:06 +00:00
Paul Crowley
fde9cd8c82 Make vdc a C++ file as a base for further improvement.
Bug: 19704432
Change-Id: I784e8a91d3b0f4d6cd0dc668e9e55d0290f768e8
2015-05-06 12:41:10 +01:00
Paul Lawrence
75c922f49b Fix problem that reading/writing crypto footers wasn't identity
Bug: 18151196
Change-Id: Ideef6bcdbccf068a64ed3e042be50c4837a373f8
2015-05-05 15:58:27 -07:00
Paul Lawrence
29b54aab8e Retry unmounts in ext4 encryption
Bug: 18151196
Change-Id: I52ca23b2ce3adcff44bd003d4a12243a0bd6ac34
2015-05-05 14:28:25 -07:00
Paul Lawrence
4571383cbf Merge "Use default key permissions for ext4enc" 2015-05-05 20:18:36 +00:00
Paul Lawrence
1190a26f6d Use default key permissions for ext4enc
As per discussion default permissions are the correct ones.
Note that since we use logon keys, they cannot be read outside
the kernel.

Note also that we limit who can read/write keys in selinux policy.

Bug: 18151196
Change-Id: Icc916f430a70eff22e6b74c20ec361c8f3789c1c
2015-05-05 11:12:37 -07:00
Paul Lawrence
0f29aec5af Merge "Simplify password checking logic" 2015-05-05 14:13:05 +00:00
Paul Lawrence
aaccfac344 Simplify password checking logic
Bug: 18151196
Change-Id: I07ffde534dee7d1032149cfcbaa1a61c5246d759
2015-05-04 15:53:51 -07:00
Paul Lawrence
04e0f4d240 am babba576: Merge "Enable properties in ext4enc"
* commit 'babba576ba0d1b6fb69c849848c8b01c8b585e24':
  Enable properties in ext4enc
2015-05-01 15:34:27 +00:00
Paul Lawrence
babba576ba Merge "Enable properties in ext4enc" 2015-05-01 15:13:41 +00:00
Paul Lawrence
4e7274551c Enable properties in ext4enc
Enables OwnerInfo and pattern suppression

Bug: 18151196

Change-Id: I46144e16cb00319deeb5492ab82c67f5dd43d6d3
2015-05-01 08:03:39 -07:00
Paul Lawrence
2184bad367 am 744a7aa5: Merge "Check password is correct by checking hash"
* commit '744a7aa54b551bbdaa0edbd806e2a125801eb1c4':
  Check password is correct by checking hash
2015-04-30 17:44:45 +00:00
Jeff Sharkey
47b9deba5b am 74e6349d: Merge "Fix signed issue with hex conversion." into mnc-dev
* commit '74e6349d8e4dde988c121e9674472908cc8c748d':
  Fix signed issue with hex conversion.
2015-04-30 17:34:00 +00:00
Paul Lawrence
744a7aa54b Merge "Check password is correct by checking hash" 2015-04-30 17:20:09 +00:00
Jeff Sharkey
74e6349d8e Merge "Fix signed issue with hex conversion." into mnc-dev 2015-04-30 17:07:15 +00:00