OSDN Git Service
Android Build Merger (Role) [Fri, 1 Jun 2018 21:46:11 +0000 (21:46 +0000)]
[automerger] Require quotes when searching for blkid keys. am:
ee5c7318d7 am:
98bb129cd3 am:
0c5a0d65c9 am:
7e51f8d0c4 am:
53fe89bbad am:
5716ee6d7a am:
4de0e883d0
Change-Id: I66ce047987d59d1344cd46e14e07ae0d3cb4bf9a
Android Build Merger (Role) [Fri, 1 Jun 2018 21:46:09 +0000 (21:46 +0000)]
[automerger] Require quotes when searching for blkid keys. am:
ee5c7318d7 am:
98bb129cd3 am:
0c5a0d65c9 am:
7e51f8d0c4 am:
53fe89bbad am:
5716ee6d7a
Change-Id: Icf5c0c0a0c4f4aec605182111dcedf16f5a4ab95
Android Build Merger (Role) [Fri, 1 Jun 2018 21:46:08 +0000 (21:46 +0000)]
[automerger] Require quotes when searching for blkid keys. am:
ee5c7318d7 am:
98bb129cd3 am:
0c5a0d65c9 am:
7e51f8d0c4 am:
53fe89bbad
Change-Id: I87042d7d1d7b2cf9baeb3f28fd9ab31e5f97f62a
Android Build Merger (Role) [Fri, 1 Jun 2018 21:46:06 +0000 (21:46 +0000)]
[automerger] Require quotes when searching for blkid keys. am:
ee5c7318d7 am:
98bb129cd3 am:
0c5a0d65c9 am:
7e51f8d0c4
Change-Id: I5f21e49be9c536e51dbaadde0bd53545dc8cbaae
Android Build Merger (Role) [Fri, 1 Jun 2018 21:46:05 +0000 (21:46 +0000)]
[automerger] Require quotes when searching for blkid keys. am:
ee5c7318d7 am:
98bb129cd3 am:
0c5a0d65c9
Change-Id: I585336447c06e09b499ad2656b731105f1ebc4c4
Android Build Merger (Role) [Fri, 1 Jun 2018 21:46:04 +0000 (21:46 +0000)]
[automerger] Require quotes when searching for blkid keys. am:
ee5c7318d7 am:
98bb129cd3
Change-Id: I91516dfd0a046aa2763df3c09ef6e8570d7f1b55
Android Build Merger (Role) [Fri, 1 Jun 2018 21:46:02 +0000 (21:46 +0000)]
[automerger] Require quotes when searching for blkid keys. am:
ee5c7318d7
Change-Id: If8422cf170db4e05dbe4cf6c1ed4ebf8126b0c71
Jeff Sharkey [Fri, 1 Jun 2018 17:31:39 +0000 (11:31 -0600)]
Require quotes when searching for blkid keys.
In combination with a blkid change, this prevents the parsing logic
from getting confused by key names appearing inside values. (The
blkid change suppresses any quotes that appear inside values.)
Bug:
80436257
Test: manual
Change-Id: I9480ef6eb78254b812c671950875d0b8918a27c6
Wei Wang [Wed, 7 Sep 2016 17:53:30 +0000 (17:53 +0000)]
Update fs_mgr_mount_all function
am:
84c985e275
Change-Id: Ia2d7410d092d7569c8f8873a101140db9320c019
Wei Wang [Fri, 26 Aug 2016 03:58:37 +0000 (20:58 -0700)]
Update fs_mgr_mount_all function
This is part of the change to support early/late fstab mounting in order
to support starting key services before /data mounting
fs_mgr_mount_all function updated with a parameter to support mounting mode
More information refer to init/readme.txt
(cherry picked from commit
1d6476c3c848ebc8fbdfa6945e1c3be447beb5a3)
Bug:
30118894
Change-Id: I5e925b900fd477f230a90514cc2b561c7a7e9f49
Jeff Sharkey [Wed, 31 Aug 2016 23:35:13 +0000 (23:35 +0000)]
DO NOT MERGE. Block adoptable storage when using FBE.
am:
84be704af4
Change-Id: If12088f04915fb4e7c239a7d0d90aa945183611d
Jeff Sharkey [Tue, 23 Aug 2016 19:48:50 +0000 (13:48 -0600)]
DO NOT MERGE. Block adoptable storage when using FBE.
For adoptable storage and FBE to coexist we need a new dm-biocrypt
kernel feature which isn't ready yet. So for now, prevent devices
from being adopted on FBE devices.
Bug:
30770036
Change-Id: I47639209161ee403ce13ea9a60da235e97c3fc30
(cherry picked from commit
157175110948b3cf604e40420059aa5265039847)
Paul Crowley [Mon, 25 Jul 2016 22:55:36 +0000 (15:55 -0700)]
Don't try to fixate CE keys for ephemeral users
Ephemeral users don't have keys stored on disk at all, so it's neither
necessary nor possible to manipulate the disk keys here.
Bug:
30038313
Change-Id: Idc7ec1bfe1e8a6ffa6cee2f284dbe378097b08da
Paul Crowley [Tue, 19 Jul 2016 22:29:53 +0000 (15:29 -0700)]
Don't fail if a key we want to delete is already deleted
This can happen when cleaning up stale users at boot time.
Bug:
30158800
Change-Id: I2733d8d525fc79b7f05eb2225b7e6e14c4da277f
Paul Crowley [Tue, 19 Jul 2016 23:00:35 +0000 (16:00 -0700)]
Don't evict keys when we delete users
Work around a kernel bug that was causing lockups.
Bug:
30225438
Change-Id: Ia6eb60774037e692351af8eaed98b79596ea3635
Jeff Sharkey [Fri, 15 Jul 2016 22:20:22 +0000 (16:20 -0600)]
Only restorecon CE storage after unlocked.
On FBE devices, the filenames inside credential-encrypted directories
are mangled until the key is installed. This means the initial
restorecon at boot needs to skip these directories until the keys
are installed.
This CL uses an existing facility to request that init run a
recursive restorecon over a given path, and it requests that
operation for the CE directories that would have been omitted by
the SKIPCE flag earlier during boot.
Bug:
30126557
Change-Id: I8c7abea27215075a091f615a7185a82a2f4a4a95
Paul Crowley [Wed, 13 Jul 2016 19:49:52 +0000 (19:49 +0000)]
Merge "Run secdiscard on encrypted key and key blob too" into nyc-mr1-dev
Paul Crowley [Wed, 13 Jul 2016 19:49:20 +0000 (19:49 +0000)]
Merge "Zero out blocks if BLKSECDISCARD fails" into nyc-mr1-dev
Paul Crowley [Thu, 7 Jul 2016 17:06:30 +0000 (10:06 -0700)]
Run secdiscard on encrypted key and key blob too
Don't rely on cryptographic binding of secdiscard to key; securely
delete the other information needed to reconstruct the key too.
Bug:
26021231
Change-Id: If03d2c051b0ec2fdcb5c6f70bde7e3287424f216
Paul Crowley [Tue, 28 Jun 2016 21:24:07 +0000 (14:24 -0700)]
Zero out blocks if BLKSECDISCARD fails
On a device where we can't BLKSECDISCARD sectors, we "overwrite" them
with zeroes. This changes the FTL to remap those sectors to new
locations. With this done, the old contents are accessible only given
a compromise of flash firmware or a die level attack.
Bug:
26021231
Change-Id: Ia065921389886fac1ba456c19c138187237c2561
Henrik Baard [Thu, 17 Dec 2015 12:58:42 +0000 (13:58 +0100)]
Failing to "Migrate data" leaves target unusable
When "migrating" data failes due to insufficient space
at target location, the data copied so far is left in
target location, which in practice is now filled to the
brim.
If copy fails clean up the data copied so far since user
has the data in original location.
Bug:
26322200
Change-Id: Iab29a7f9e653e6857ee0e2723d151dfec81b14dd
Henrik Baard [Thu, 26 Nov 2015 11:05:13 +0000 (12:05 +0100)]
Migrating data sometimes leaves emulated unmounted
Sometimes migrating data fails to mount the target
volume after operation is finished.
MoveTask is running in its own thread, copying data
between external card and internal memory.
After copying the data the method "bringOnline" is
run. This method destroys and creates the volumes.
When VolumeBase::create() is run it will notify
MountService, who upon receiving this notification
will send a mount command to mount the new primary
storage.
This command will sometimes run before
setState(State::kUnmounted); is called on the newly
created volume. This will cause the mount command to
fail.
VoldConnector: SND -> {10 volume mount emulated 3 -1}
vold : emulated flags change requires state unmounted or unmountable
vold : emulated user change requires state unmounted or unmountable
vold : emulated mount requires state unmounted or unmountable
Lock bringOnline so no volume commands will be processed
until volumes are (re-)created and have correct state.
Bug:
26322200
Change-Id: I4aba85c226d904c42ae9edcdfec21619218939d6
Jeff Sharkey [Mon, 27 Jun 2016 17:17:51 +0000 (11:17 -0600)]
Fix copy/paste error in benchmark code.
This had minimal impact on the results, since 95% of the writes were
performed through pwrite(), but it's important to fix this for future
benchmark suites.
Bug:
29759783
Change-Id: Ic628aab98b9f9def78508cc722899afdefed84ae
Yabin Cui [Fri, 24 Jun 2016 21:48:49 +0000 (14:48 -0700)]
Use libbootloader_message.
Bug:
29582118
Change-Id: I8de2cfbc62908011dba2ab86d17f977ebcfadac0
Paul Lawrence [Wed, 22 Jun 2016 16:24:51 +0000 (09:24 -0700)]
Stop dropping caches now we have kernel fix
Only merge once
https://partner-android-review.googlesource.com/#/c/619829/1
has been merged into kernel.
Bug:
28779973
Change-Id: Icef78d1e4381e89e07797c36f6f650033d313557
Paul Lawrence [Tue, 24 May 2016 21:20:38 +0000 (14:20 -0700)]
Set encryption mode in mode file
Bug:
28905864
Change-Id: Ie2a5c3e029075d53a86ef3afb7fe364c16d8d52b
Paul Lawrence [Mon, 23 May 2016 22:03:20 +0000 (22:03 +0000)]
Revert "Add fileencrypted=software/ice to fstab options"
This reverts commit
01f1bc725475098e5ae07fd8f440abcd55b154c4.
Bug:
28905864
Change-Id: I489f5d073530438829038630af7af6b2a5cbdbbe
Paul Crowley [Wed, 18 May 2016 22:59:57 +0000 (22:59 +0000)]
Two phases to set the password for disk encryption
am:
a363036b44
* commit '
a363036b44f7f140aa9a943578f56abff5880a60':
Two phases to set the password for disk encryption
Change-Id: Ia28823079d8c0bda220238339f28095b234a0ae5
Paul Crowley [Tue, 17 May 2016 21:17:56 +0000 (14:17 -0700)]
Two phases to set the password for disk encryption
Revert "Revert "Two phases to set the password for disk encryption""
This reverts commit
d402389290eeef86be7eb9241e20fdd125d44eb1.
In addition, fix the bug in the original commit.
Bug:
28154455
Bug:
28694324
Change-Id: I885f1d73e739416347c135d79979941c2bbdbe62
Paul Lawrence [Thu, 5 May 2016 18:02:07 +0000 (11:02 -0700)]
Add fileencrypted=software/ice to fstab options
Bug:
28616054
Change-Id: If3fddd62f069c7e3e8369a1db68e69c390059d63
Paul Crowley [Tue, 10 May 2016 22:17:38 +0000 (22:17 +0000)]
Merge "e4crypt_is_native has been moved into system/extras." into nyc-dev
am:
cfa03d4a4c
* commit '
cfa03d4a4c53acf41dca2c41a2efd00de06043bb':
e4crypt_is_native has been moved into system/extras.
Change-Id: I345475c44fb2d8812a25c9f2195c748cddc55bfe
Paul Crowley [Tue, 10 May 2016 22:12:49 +0000 (22:12 +0000)]
Merge "e4crypt_is_native has been moved into system/extras." into nyc-dev
Paul Crowley [Tue, 10 May 2016 21:19:47 +0000 (21:19 +0000)]
Revert "Two phases to set the password for disk encryption"
am:
d402389290
* commit '
d402389290eeef86be7eb9241e20fdd125d44eb1':
Revert "Two phases to set the password for disk encryption"
Change-Id: I53a3804fc7bff9c99840aeee36fc4b7ff8e46ac1
Paul Crowley [Tue, 10 May 2016 20:36:43 +0000 (20:36 +0000)]
Revert "Two phases to set the password for disk encryption"
This reverts commit
92c5eeb46779f0fa1c9e6db6b0d632d960cbb2e4.
Bug:
28694324
Change-Id: Ibbbaff287f4dd28f4a13e122a3617987a8875a44
Paul Crowley [Wed, 27 Apr 2016 17:25:12 +0000 (10:25 -0700)]
e4crypt_is_native has been moved into system/extras.
Bug:
28318405
Change-Id: Id962764cf7fb5f58b769bf99aeb6d3d69cb66991
Paul Crowley [Mon, 9 May 2016 21:51:33 +0000 (21:51 +0000)]
Two phases to set the password for disk encryption
am:
92c5eeb467
* commit '
92c5eeb46779f0fa1c9e6db6b0d632d960cbb2e4':
Two phases to set the password for disk encryption
Change-Id: I82c1cfa2874ac4709e42f5c2047c832cbcaccb91
Paul Crowley [Fri, 22 Apr 2016 19:09:54 +0000 (12:09 -0700)]
Two phases to set the password for disk encryption
In one phase, we make the new password work, and in the second we make
it the only one which works ("fixation"). This means that we can set
the password in Gatekeeper between these two phases, and a crash
doesn't break things. Unlocking a user automatically fixates the
presented credential.
Bug:
28154455
Change-Id: I54623c8652f0c9f72dd60388a7dc0ab2d48e81c7
Paul Lawrence [Fri, 29 Apr 2016 16:32:02 +0000 (16:32 +0000)]
Merge "Drop caches after installing key policy to avoid cache clashes" into nyc-mr1-dev
Paul Lawrence [Tue, 26 Apr 2016 19:50:53 +0000 (12:50 -0700)]
Drop caches after installing key policy to avoid cache clashes
Note that this is an ugly workaround for a kernel bug.
Bug:
28373400
Change-Id: Iec1ae53f4e18f06e41e8cf1fcc3ab03fc9848632
Paul Crowley [Wed, 27 Apr 2016 22:53:18 +0000 (22:53 +0000)]
Use a longer timeout on the disk encryption keys
am:
b3de337
* commit '
b3de337acd7ad07de1ed30d24fdfd628d1d8590b':
Use a longer timeout on the disk encryption keys
Change-Id: Ieadec9da13383361ac76bf6b79ecea948965a1d9
Paul Crowley [Wed, 27 Apr 2016 19:58:41 +0000 (12:58 -0700)]
Use a longer timeout on the disk encryption keys
Avoid a timeout error by extending the time allowed between getting
the auth token and decrypting the key from five to thirty seconds.
Bug:
28398766
Change-Id: I1dbb9e0e33707e7de4c1720ad1b8e153c77094b2
John Cormie [Mon, 25 Apr 2016 23:57:06 +0000 (23:57 +0000)]
Merge "Unmount public sdcard filesystems before killing the fuse process." into nyc-dev
am:
a4330be
* commit '
a4330beb482c3b5decf6a6fc966e5589210130eb':
Unmount public sdcard filesystems before killing the fuse process.
Change-Id: I294d46bb27fb6d8ac83f1041e849fd366134b6ee
John Cormie [Mon, 25 Apr 2016 23:49:28 +0000 (23:49 +0000)]
Merge "Unmount public sdcard filesystems before killing the fuse process." into nyc-dev
Martijn Coenen [Mon, 25 Apr 2016 18:03:42 +0000 (18:03 +0000)]
Merge "Move vold (and sdcard childs) to foreground cpuset." into nyc-dev
am:
47ff14a
* commit '
47ff14ad38ec96fef25b2bbe1b3365fcd97bc8f5':
Move vold (and sdcard childs) to foreground cpuset.
Change-Id: I2d539472902f0f2ce33bbfe767f93b9bf91856ce
Martijn Coenen [Mon, 25 Apr 2016 17:46:01 +0000 (17:46 +0000)]
Merge "Move vold (and sdcard childs) to foreground cpuset." into nyc-dev
John Cormie [Mon, 18 Apr 2016 21:23:29 +0000 (14:23 -0700)]
Unmount public sdcard filesystems before killing the fuse process.
Avoids ENOTCONN during eject for sdcard users.
Change-Id: I7b89ccaad4bb7af3639dc0b702168030a2f88366
Bug:
28268676
Paul Lawrence [Tue, 19 Apr 2016 14:47:13 +0000 (14:47 +0000)]
Merge "Don\'t start defaultcrypto twice" into nyc-dev
am:
0264d8f
* commit '
0264d8ff7c2d5a2cdb4faaf9a3493103138373dd':
Don't start defaultcrypto twice
Change-Id: I39951628d41f656901658cd82a56298ef9f663ec
Paul Lawrence [Tue, 19 Apr 2016 14:44:26 +0000 (14:44 +0000)]
Merge "Don't start defaultcrypto twice" into nyc-dev
Paul Lawrence [Fri, 15 Apr 2016 22:41:33 +0000 (15:41 -0700)]
Don't start defaultcrypto twice
The old way (using triggers) starts defaultcrypto twice because
queue_property_triggers_action retriggers the action.
Bug:
27452459
Change-Id: I715d5441f8ae0b820b680f6a75f51694c4420992
Jeff Sharkey [Mon, 18 Apr 2016 19:59:55 +0000 (19:59 +0000)]
Consistent creation/destruction of user data.
am:
be70c9a
* commit '
be70c9ae2251ac8f3bfbbe75146f8c533d64e01b':
Consistent creation/destruction of user data.
Change-Id: I55f4fe88a8c02d019fa92028e6ad358fc0f75aeb
Jeff Sharkey [Fri, 15 Apr 2016 02:45:16 +0000 (20:45 -0600)]
Consistent creation/destruction of user data.
Preparing and destroying users currently needs to be split across
installd, system_server, and vold, since no single party has all the
required SELinux permissions.
Bug:
27896918,
25861755
Change-Id: Ieec14ccacfc7a3a5ab00df47ace7318feb900c38
Martijn Coenen [Fri, 15 Apr 2016 12:30:40 +0000 (14:30 +0200)]
Move vold (and sdcard childs) to foreground cpuset.
Bug:
24949295
Change-Id: I7118a374db90ede517a92f72763d624b9a234ea7
Yabin Cui [Fri, 8 Apr 2016 21:03:42 +0000 (21:03 +0000)]
Merge "vold: write bootloader message directly." into nyc-dev
Daichi Hirono [Thu, 7 Apr 2016 05:59:32 +0000 (14:59 +0900)]
Add log flag for verbose AppFuse log for nyc-dev.
Change-Id: I60ca596e32f8668ae5895e671d92c4978ede6314
Fixed:
28055420
Yabin Cui [Thu, 7 Apr 2016 00:21:38 +0000 (17:21 -0700)]
vold: write bootloader message directly.
Bug:
27176738
Change-Id: I09bfe777e383325809d7ecc2dcb9129fe234053f
Jeff Sharkey [Thu, 31 Mar 2016 02:37:28 +0000 (20:37 -0600)]
Kill apps using PublicVolume when unmounting.
Bug:
24863778
Change-Id: I86a482c6de78afe2e09ca91165000e1b10a42058
Paul Crowley [Fri, 25 Mar 2016 22:50:01 +0000 (15:50 -0700)]
Don't fail if the CE key isn't loaded in destroy_user_key
Users don't have to be unlocked to be deleted, so don't worry if we
don't have their key to evict.
Bug:
26847403
Bug:
27441228
Change-Id: Ifd93f620926630aa102a3bb4a5d2d45d34f9b75d
Paul Crowley [Wed, 16 Mar 2016 00:04:39 +0000 (17:04 -0700)]
Support Keymaster2 with lots of clever template logic :)
Bug:
27718275
Change-Id: I0b2aa74f45fd07a121ce0c342b27426a3fe593ce
Paul Lawrence [Fri, 11 Mar 2016 19:02:52 +0000 (11:02 -0800)]
Fix some static analyser issues
Bug:
27099772
Change-Id: Ic96777edf4ea282be2b8f53525226396c01e023c
Paul Lawrence [Fri, 11 Mar 2016 01:42:55 +0000 (01:42 +0000)]
Merge "Make sure encryption type is set on first boot" into nyc-dev
Jeff Sharkey [Fri, 11 Mar 2016 00:07:25 +0000 (00:07 +0000)]
Merge "Print size as unsigned when sending to framework." into nyc-dev
Paul Lawrence [Thu, 10 Mar 2016 23:44:21 +0000 (15:44 -0800)]
Make sure encryption type is set on first boot
Bug:
27599622
Change-Id: I2f38c03941ac8cdba40baf7421132f572866e296
Jeff Sharkey [Thu, 10 Mar 2016 19:11:09 +0000 (12:11 -0700)]
Print size as unsigned when sending to framework.
Otherwise we might output negative numbers that confuse the rest
of the recovery stack.
Bug:
26007445
Change-Id: Ic99b49360732e5389c6330be065e1222e25b60ca
Prathmesh Prabhu [Thu, 10 Mar 2016 17:12:59 +0000 (17:12 +0000)]
Merge "Support emulator's virtio-blk based SD card" into nyc-dev
Daniel Rosenberg [Wed, 9 Mar 2016 23:58:12 +0000 (23:58 +0000)]
Merge "Add information to error message" into nyc-dev
Daniel Rosenberg [Sat, 27 Feb 2016 00:44:36 +0000 (16:44 -0800)]
Add information to error message
Bug:
27452459
Change-Id: I89e813755da0946de4effd827799681df7e12d82
Paul Crowley [Wed, 9 Mar 2016 17:31:37 +0000 (09:31 -0800)]
Run clang-format over ext4crypt related code
The formatting here is inconsistent with Android house style; use
clang-format to bring it back into line.
Change-Id: Id1fe6ff54e9b668ca88c3fc021ae0a5bdd1327eb
Paul Crowley [Wed, 9 Mar 2016 00:08:32 +0000 (16:08 -0800)]
Use pointers not references for out arguments
Google/Android C++ style requires that arguments passed in for writing
should be pointers, not references, so that it's visible in the caller
that they'll be written to.
Bug:
27566014
Change-Id: I5cd55906cc4b2f61c8b97b223786be0b3ce28862
Paul Crowley [Fri, 4 Mar 2016 22:07:05 +0000 (14:07 -0800)]
Require the auth token for decryption.
A bug meant that the auth token wasn't being used; it turns out that
in order to use it we need to do things slightly differently.
Bug:
27496553
Change-Id: I0f0ab77fed31b92a79eba4acf488cb098691b4be
Paul Crowley [Fri, 4 Mar 2016 21:45:00 +0000 (13:45 -0800)]
Fix memory leak in generate_key wrapper. Other fixes.
- catch errors in looking for the keyring
- static_assert to prevent a buffer overrun
- remove obsolete, misleading comment
- dial down priority of some log messages
- explain why we ignore some errors
- idiomatic C++11
Bug:
27552432
Change-Id: Ic3ee05b41eae45e7c6b571a459b326a483663526
Yu Ning [Fri, 8 Jan 2016 09:36:47 +0000 (17:36 +0800)]
Support emulator's virtio-blk based SD card
Currently, vold only supports MMC (for SD cards) and SCSI (for USB
drives) devices. It does not recognize any device whose major number is
not one of those used by MMC and SCSI. Unfortunately, virtio-blk is one
such device. It is used by the new Android emulator (a.k.a. qemu2,
featuring the "ranchu" virtual board) for SD card emulation.
In order to make this virtio-blk based SD card device appear in Android
and appear as an SD card (rather than a USB drive), changes have to be
made to both vold (wherever the device major number is checked) and
ranchu's storage configuration. This CL implements former.
This is a stop-gap solution for emulator in nyc.
A longer term solution in-tune with upstream kernel is in the pipes.
Updated from aosp/master version.
BUG:
27431753
Change-Id: I5014edec73be7c5b565d91542464c82cbe58992c
Signed-off-by: Yu Ning <yu.ning@intel.com>
(cherry picked from commit
5b1d1c7dfa13b4dca75213581dc8351b841b76c8)
Paul Crowley [Wed, 2 Mar 2016 18:59:58 +0000 (18:59 +0000)]
Merge "Use a proper key length for the mode." into nyc-dev
Paul Crowley [Wed, 2 Mar 2016 17:15:07 +0000 (09:15 -0800)]
Use a proper key length for the mode.
Bug:
27440526
Change-Id: I818450252dcd39f21948fc2e70856659eba5f50f
Calin Juravle [Wed, 2 Mar 2016 18:36:50 +0000 (18:36 +0000)]
Prepare profile directories only for the internal storage
Bug:
27444691
Change-Id: I0d30e8883fe655c90cda47ab167a878764ea0802
Calin Juravle [Wed, 24 Feb 2016 16:27:19 +0000 (16:27 +0000)]
Create profile folder for foreign dex markers.
This is a special profile folder where apps will leave profile markers
for the dex files they load and don't own. System server will read the
markers and decide if the apks should be fully compiled instead of
profile guide compiled.
Bug:
27334750
Bug:
26080105
Change-Id: Ib18f20cf78a8dbfc465610ec6ceec52699c5420a
Calin Juravle [Wed, 17 Feb 2016 20:14:46 +0000 (20:14 +0000)]
Prepare user profile folder
Bug:
26719109
Bug:
26563023
Change-Id: I4737b7f73df74b2b787a62db2e231f136115b359
Paul Crowley [Wed, 10 Feb 2016 17:56:05 +0000 (17:56 +0000)]
Log a warning if old creds passed to change_user_key don't work.
Bug:
26948053
Change-Id: I8c117bfe5e85e73af72b6ecafea39924f3561c7c
Paul Crowley [Wed, 10 Feb 2016 14:02:47 +0000 (14:02 +0000)]
Add scrypt-based password stretching.
Bug:
27056334
Change-Id: Ifa7f776c21c439f89dad7836175fbd045e1c603e
Paul Lawrence [Tue, 9 Feb 2016 19:32:44 +0000 (19:32 +0000)]
Merge "Fix encryption on non-default devices" into nyc-dev
Paul Lawrence [Tue, 9 Feb 2016 19:24:28 +0000 (11:24 -0800)]
Fix encryption on non-default devices
Bug:
27061863
Change-Id: Id998bb4534f657079e95718ef52af3f23100fb10
Paul Crowley [Tue, 9 Feb 2016 10:04:39 +0000 (10:04 +0000)]
Prefer bool returns to int throughout
Change-Id: Ib3592b598ee07bc71a6f9507570bf4623c1cdd6a
Paul Crowley [Tue, 9 Feb 2016 09:50:32 +0000 (09:50 +0000)]
Refactor now that global DE has been reworked
Change-Id: I4d6156332cfc847e25e7c8863fd6a50fa325fb87
Paul Crowley [Tue, 9 Feb 2016 09:30:23 +0000 (09:30 +0000)]
Fix some "false" returns to be "-1" where appropriate in e4crypt_enable
Also fix a PLOG that should be a LOG.
Change-Id: Ic5ae288c37b6e236172f9e38349c2d0d530bfd4d
Jeff Sharkey [Tue, 9 Feb 2016 01:10:34 +0000 (18:10 -0700)]
e4crypt_unlock_user_key no longer likes nullptr.
Bug:
27075797
Change-Id: I835d17d02ea50a88ef0a5322a30e04f3d0237019
Paul Crowley [Mon, 8 Feb 2016 22:40:34 +0000 (22:40 +0000)]
Add new argument to unlock_user_key, fixing merge-caused error.
Change-Id: Ic51f375e500cd61bda926e3b039126a840ed89f0
Paul Crowley [Mon, 8 Feb 2016 21:45:46 +0000 (21:45 +0000)]
Merge "Password security for FBE disk encryption keys" into nyc-dev
Paul Crowley [Mon, 8 Feb 2016 15:55:41 +0000 (15:55 +0000)]
Password security for FBE disk encryption keys
Added a new call change_user_key which changes the way that disk
encryption keys are protected; a key can now be protected with a
combination of an auth token and a secret which is a hashed password.
Both of these are passed to unlock_user_key.
This change introduces a security bug, b/
26948053, which must be fixed
before we ship.
Bug:
22950892
Change-Id: Iac1e45bb6f86f2af5c472c70a0fe3228b02115bf
Jeff Sharkey [Mon, 8 Feb 2016 19:21:42 +0000 (12:21 -0700)]
Emulation fixes: mics dirs, recover after disable.
Add new misc directories to list of paths that we lock/unlock in
emulation mode. When booting a device without native-FBE and without
emulation, make sure we "unlock" any emulated settings on user 0;
MountService handles this for secondary users later during boot.
Bug:
27069522
Change-Id: I15c7cf00a7231ce99b2e4e11a25106d7b87e70cc
Daichi Hirono [Sun, 7 Feb 2016 04:01:24 +0000 (04:01 +0000)]
Merge "Add context mount option for appfuse."
Jeff Sharkey [Tue, 2 Feb 2016 00:02:29 +0000 (17:02 -0700)]
Allow callers to prepare CE/DE user storage.
Give callers the option of preparing CE and/or DE storage. The
framework will only prepare CE storage after the CE keys have been
unlocked for that user.
When init is calling enablecrypto, kick off the work in a thread so
that we can make other calls back into vold without causing
deadlock. Leaves blocking call intact for framework callers.
Clean up 'vdc' tool to send useful transaction numbers, and
actually watch for the matching result to come back. This fixes
race conditions when there are multiple 'vdc' callers.
Also add other system and misc directories to match spec.
Bug:
25796509
Change-Id: Ie4f853db6e387916b845d2b5fb92925d743b063d
Daichi Hirono [Tue, 26 Jan 2016 01:27:45 +0000 (10:27 +0900)]
Add context mount option for appfuse.
BUG=
26147865
Change-Id: I1812c46d0f80eaea9a9a3fa944bc4d0126ae8ba1
Paul Lawrence [Thu, 4 Feb 2016 16:18:52 +0000 (08:18 -0800)]
Remove unencrypted_properties
Change-Id: I5728f03dbde6621e410efcda1d93054915793407
Paul Lawrence [Wed, 3 Feb 2016 21:39:13 +0000 (13:39 -0800)]
Fix minor issues with previous change
New style logging
Remove set/get field from e4crypt
Save keys to temp file then rename
See https://googleplex-android-review.git.corp.google.com/#/c/858922/
Change-Id: I454c3f78489b491ffc1230a70dce64935e4e0f8a
Paul Lawrence [Wed, 3 Feb 2016 18:52:41 +0000 (10:52 -0800)]
Use consistent method for device key
Change-Id: I420f548115c1b55e62b193c60d569fdda518af1a
Paul Lawrence [Tue, 2 Feb 2016 19:14:59 +0000 (11:14 -0800)]
Remove support for non-default root passwords in FBE
Change-Id: Ie179cb09f9f24382afd0fe0f3aa2a1ad943a7f5d
Daichi Hirono [Tue, 2 Feb 2016 10:14:29 +0000 (10:14 +0000)]
Merge "Mount appfuse in process namespace."
Daichi Hirono [Fri, 29 Jan 2016 05:33:51 +0000 (14:33 +0900)]
Mount appfuse in process namespace.
BUG=
26148108
Change-Id: I2297fd227a4c607054e0403e73bd9c857f580a1c
Jeff Vander Stoep [Mon, 1 Feb 2016 23:24:58 +0000 (15:24 -0800)]
resolve merge conflicts of
2b6f9ce823 to master.
Change-Id: I69f36f560334b11b099f2eb15999603dd2469d4f
Jeffrey Vander Stoep [Mon, 1 Feb 2016 23:10:31 +0000 (23:10 +0000)]
Merge "cryptfs: run e2fsck/fsck.f2fs in fsck domain"
am:
6f69ee094c
* commit '
6f69ee094cabcd052a4742089fcae8e92cf7f924':
cryptfs: run e2fsck/fsck.f2fs in fsck domain
Jeffrey Vander Stoep [Mon, 1 Feb 2016 23:05:55 +0000 (23:05 +0000)]
Merge "cryptfs: run e2fsck/fsck.f2fs in fsck domain"