OSDN Git Service
Chih-Wei Huang [Thu, 10 Sep 2015 17:02:23 +0000 (01:02 +0800)]
Merge branch 'cm-12.1' into lollipop-x86
Chih-Wei Huang [Thu, 16 Jul 2015 18:40:10 +0000 (02:40 +0800)]
AutoVolume: ignore unusable disks
The disks like mmcblk0boot0 or mmcblk0rpmb should be ignored.
Björn Landström [Tue, 20 Jan 2015 11:43:56 +0000 (12:43 +0100)]
Change lseek to lseek64
Using lseek on 64-bit offset parameter caused failure
to write persistent data in crypto footer.
Changed calls to use lseek64 instead.
Change-Id: I4e4c397a6d36201b8b08be3017e17c9fac3b34e4
Henrik Baard [Thu, 5 Feb 2015 14:09:17 +0000 (15:09 +0100)]
Fix memory leak in upgrade_crypt_ftr
The structure crypt_persist_data was allocated,
but never freed.
Added free of allocated memory in normal and
error case.
Change-Id: I9aaa067e6f6501e8ce007f8659004b5dbcf2b246
Ethan Chen [Fri, 13 Feb 2015 22:09:40 +0000 (14:09 -0800)]
vold: Fix compilation
* AID_MEDIA_RW needs to be defined
Change-Id: I528cdf603f605430c9c8b83111c66f8bf7350ffe
Michael Stucki [Fri, 13 Feb 2015 13:10:47 +0000 (14:10 +0100)]
Fix Ext4 sdcard permissions on mount
Fix ownership of sdcards the same way as for F2FS.
Change-Id: Ia34ad91444951e62f6d17374f480dcbdfa34cca3
Pawit Pornkitprasan [Mon, 19 Jan 2015 13:58:49 +0000 (20:58 +0700)]
vold: fix asec on ExFAT
The ExFAT fuse driver doesn't implement dent->d_type, so we
need to find the file type using lstat
Change-Id: Ie4070bf77c61231ecb7cd62e39bd5ce8805b3896
Jiangyi [Tue, 23 Dec 2014 21:42:32 +0000 (16:42 -0500)]
Vold: Correct part_num ignore logic
Only ignore the partition if part_num is greater than MAX_PARTITIONS, since it could be
equal to MAX_PARTITIONS, which would make it still within the array bounds. Also correct the
log message associated with it.
Change-Id: Ib4acbfb20dd88a2cfb22d249aef6fca5fae9ace4
Tom Marshall [Sat, 13 Dec 2014 00:36:51 +0000 (16:36 -0800)]
vold: Mount ext4/f2fs sdcards with sdcard_posix context
Change-Id: I05d9b57cc28ffd1f8deb8148d81c7f6fad0aa8db
arter97 [Sat, 13 Sep 2014 14:06:05 +0000 (23:06 +0900)]
f2fs: disable fsck check
fsck.f2fs does not fix any inconsistencies "yet".
Disable fsck routine as this is just wasting time consumed to mount f2fs volumes.
The kernel can determine if a f2fs volume is too damaged that it shouldn't get mounted.
We should wait for f2fs-tools version higher than v1.3.0.
(fsck.f2fs for fixing inconsistencies is a work-in-progress)
References:
https://github.com/torvalds/linux/blob/master/Documentation/filesystems/f2fs.txt#L261
https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git
Change-Id: I7e0a4662ac70860fe139bb9331b7aee1ad76220f
Signed-off-by: Park Ju Hyung <qkrwngud825@gmail.com>
Evan McClain [Mon, 17 Mar 2014 17:37:34 +0000 (13:37 -0400)]
Add Flash-Friendly File System (f2fs) support.
Change-Id: If46bf7329a7453122a4379f9bc41cf9553426e74
Ricardo Cerqueira [Fri, 7 Mar 2014 02:24:26 +0000 (02:24 +0000)]
Volume: Don't crap out when dealing with unformatted cards
Change-Id: I2ab58328d07a343a5ec9e1c4b58f8258f0c9133c
timduru [Thu, 16 Jan 2014 08:22:16 +0000 (09:22 +0100)]
Fix Ext4 not being mounted
Change-Id: I8b01482d5b4e6627dbd082cd2806f44554278f92
Chih-Wei Huang [Fri, 9 Jan 2015 16:37:13 +0000 (00:37 +0800)]
vold: support AutoVolume in fstab
If the device name is auto, use AutoVolume to handle it.
Chih-Wei Huang [Sun, 5 Jan 2014 17:04:31 +0000 (01:04 +0800)]
vold: add class AutoVolume to support auto-mount and fake sdcard
We support up to 4 USB/MMC/SD to be auto mounted.
Besides, always allow auto mount even SDCARD is not empty.
Steve Kondik [Sat, 24 Aug 2013 03:49:29 +0000 (20:49 -0700)]
vold: Use mke2fs to format ext4 when not creating containers.
Change-Id: I2bc0f92d59adb9604b35a1f70febccfba68715d3
Tom Marshall [Fri, 2 May 2014 19:43:07 +0000 (12:43 -0700)]
vold: Honor mount options for ext4 mounts
Change-Id: Ie77e0d402c2c16d544251f7fdaeaad34d030d121
Pawit Pornkitprasan [Wed, 13 Nov 2013 14:42:31 +0000 (21:42 +0700)]
vold: allow non-vfat devices to be used as ASEC
CM supports alternative file systems (which some devices specify
in the fstab as 'auto').
Change-Id: I7e78fe87a7efc49d6749d5892107085d55156cce
Pawit Pornkitprasan [Tue, 12 Nov 2013 07:58:59 +0000 (14:58 +0700)]
vold: Add selinux support to ext4
Squashed commit of the following:
Author: Pawit Pornkitprasan <p.pawit@gmail.com>
vold: mount ext4 with forced SELinux context
Always mount voldmanaged ext4 partitions with the SELinux sdcard_external
context. For other file systems, this is done via the genfs_context,
but since ext4 supports SELinux natively, it must be set here.
Change-Id: I1364f37018b25d79b1826c85849def64e868d72f
Author: Pawit Pornkitprasan <p.pawit@gmail.com>
vold: force SELinux context only for sdcard
Google uses this code to mount ASEC as well and we shouldn't force
their SELinux contexts
Change-Id: I873af4dc2309d3d0942ce466b8acf8158abb85ae
Author: Jorge Ruesga <jorge@ruesga.com>
vold: pass selinux context to ext4 mount (remount ro)
Change-Id: Ic0bb314b30e42489c45caec29d35d6896c9849eb
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Change-Id: I1364f37018b25d79b1826c85849def64e868d72f
codeworkx [Thu, 31 Jan 2013 17:49:46 +0000 (17:49 +0000)]
vold: add support for ext4 media
Squashed commit of the following:
Author: codeworkx <codeworkx@cyanogenmod.org>
vold: add support for ext4 media
Depends on:
http://review.cyanogenmod.org/31202
http://review.cyanogenmod.org/31211
Result:
http://pastebin.com/nzUbvW7K
Change-Id: I5bd227e637f2a1ed4d13a2eb81390c56c953f482
Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
vold: Replace usage of discontinued logwrap()
Change-Id: Ia76bf8998064beee5e0ea4451c4dd8418c2193c4
Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Apply the mounts to the SDCARD /storage path instead of /mnt/media_rw
Change-Id: I6c8d73a00c6ffa64875f3c4c718d8a416d08d5c1
Author: Pawit Pornkitprasan <p.pawit@gmail.com>
vold: restore 4.4 sdcard logic
Mount points in 4.4 are always fuse-wrapped to provide granular
permission. Unix file systems no longer need to be manually
fuse-wrapped by us.
Change-Id: I6885b0baeaae7c380ec32d410a70a4f53801157b
Change-Id: I5bd227e637f2a1ed4d13a2eb81390c56c953f482
Steve Kondik [Sat, 6 Jul 2013 11:00:54 +0000 (04:00 -0700)]
vold: exFAT support
* Add support for exFAT using FUSE implementation.
Change-Id: I590c7b1bc8fbcb8c0b2c669f4073ac022857e4da
Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
vold: Replace usage of discontinued logwrap()
Change-Id: Ia76bf8998064beee5e0ea4451c4dd8418c2193c4
Change-Id: I590c7b1bc8fbcb8c0b2c669f4073ac022857e4da
kallt_kaffe [Wed, 7 Mar 2012 09:42:19 +0000 (10:42 +0100)]
vold: Add NTFS support
Squashed commit of the following:
Author: kallt_kaffe <kallt_kaffe@apedroid.com>
vold: Add ntfs (read-only) support.
See http://review.cyanogenmod.com/#change,7457 for more info.
Change-Id: Ic841e73be6435e8bbbb22984cc749e27c46826e8
Author: Steve Kondik <shade@chemlab.org>
vold: Add NTFS read+write support via ntfs-3g
* Use ntfs-3g for full NTFS support.
* Original code from Freescale.
Change-Id: I01191c3c339421904dc9415eb00143f7f8365152
Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
vold: Replace usage of discontinued logwrap()
Change-Id: Ia76bf8998064beee5e0ea4451c4dd8418c2193c4
Author: Steve Kondik <shade@chemlab.org>
Add support for formatting NTFS.
Change-Id: Ic841e73be6435e8bbbb22984cc749e27c46826e8
codeworkx [Thu, 31 Jan 2013 14:44:16 +0000 (14:44 +0000)]
vold: use blkid to detect filesystem type
In preparation for handling ext4 partitions via vold and fuse.
Change-Id: Ibaccded63a7a293ad53f16afb80448ddd493554c
Shashank Mittal [Fri, 5 Sep 2014 02:59:12 +0000 (19:59 -0700)]
vold: Fix encryption issue due to stack corruption.
Ioctl BLKGETSIZE expects pointer to unsigned long as argument.
On 64bit target using pointer to unsigned int can cause stack
corruption due to type mismatch.
Change-Id: I422068ba5006c0b685f1504e1e6aa30152ee8433
Chih-Wei Huang [Thu, 27 Jan 2011 03:30:28 +0000 (11:30 +0800)]
vold: do not consider a fatal error on initializeMbr failed
Instead, format the entire device and try to mount it.
In this way we are able to support more generic block devices
like loopback device or ramdisk. It's not possible to initialize
mbr on such devices. But they can still be formatted and
mounted correctly.
Change-Id: I14b3cd1b2986c84efba1f9ce5dba99634b6b462f
Chih-Wei Huang [Thu, 18 Nov 2010 09:33:58 +0000 (17:33 +0800)]
vold: avoid mismatch wrong device with same prefix
Suppose we have two devices whose devpath are
/devices/...../mmcblk1
/devices/...../mmcblk11
and the first is the target device. The current implementation will
mismatch the later device.
Since we hope to match the target device and its partitions
whose devpath are
/devices/...../mmcblk1/...
so the correct devpath should have the expected prefix,
followed by '\0' or '/'.
Change-Id: I398b55712b884a8499f73a52bc863b4d8294ee5e
The Android Automerger [Mon, 9 Feb 2015 14:10:57 +0000 (06:10 -0800)]
merge in lmp-mr1-release history after reset to lmp-mr1-dev
Paul Lawrence [Fri, 6 Feb 2015 16:56:13 +0000 (16:56 +0000)]
Revert "Make encryption configurable"
This reverts commit
6a69cfc411c086f15d59b7dc105763af16620414.
The original fix seems to have led to boot failures in QA. Rather than
risk shipping, revert the change. Bug
18764230 reopened.
Requires change
https://googleplex-android-review.git.corp.google.com/#/c/629950/
Bug:
19278390
Bug:
19199624
Change-Id: Ia858c4db0abb917f9364ec8048f59ca4fb48e233
The Android Automerger [Tue, 27 Jan 2015 14:10:50 +0000 (06:10 -0800)]
merge in lmp-mr1-release history after reset to lmp-mr1-dev
Paul Lawrence [Wed, 21 Jan 2015 17:58:26 +0000 (09:58 -0800)]
Make encryption configurable
Add maybeenabledefaultencryption function, that encrypts based
on the encryption flag and appropriate environment variable
Bug:
18764230
Change-Id: Id9a1967d09a7ae63a51240c0a5f3c41505af0e9a
The Android Automerger [Wed, 3 Dec 2014 14:11:43 +0000 (06:11 -0800)]
merge in lmp-mr1-release history after reset to lmp-mr1-dev
Paul Lawrence [Tue, 2 Dec 2014 18:34:14 +0000 (18:34 +0000)]
Merge "Fix error in clocks leading to devices staying unlocked" into lmp-mr1-dev
Paul Lawrence [Tue, 2 Dec 2014 18:20:04 +0000 (18:20 +0000)]
Merge "Fix encrypt-and-wipe" into lmp-mr1-dev
Paul Lawrence [Tue, 11 Nov 2014 20:26:09 +0000 (12:26 -0800)]
Do not log passwords returned through vdc
Requires framework change:
https://googleplex-android-review.git.corp.google.com/#/c/585511/
Bug:
18260068
Change-Id: I95d3bb39404ede7128b8f5d61ce2423a5f09a9b8
Paul Lawrence [Tue, 11 Nov 2014 20:47:03 +0000 (12:47 -0800)]
Fix error in clocks leading to devices staying unlocked
Use BOOTTIME consistently!
Bug:
18246810
Change-Id: I630bf39f72ab69f971d2f772e8d4545ffe467b82
Paul Lawrence [Tue, 25 Nov 2014 22:57:32 +0000 (14:57 -0800)]
Fix encrypt-and-wipe
encrypt-and-wipe was broken when checks were added that encryption succeeded
which assumed a 'normal' full encrypt traversing the device.
encrypt-and-wipe doesn't traverse, it just lays down a file system over
the encrypted device, so in this mode do not check the amount encrypted -
it will always be 0.
Bug:
18511900
Change-Id: Icb1d7e0cdb67abd2eac0ab3cbfc1a88912768f9d
Iliyan Malchev [Fri, 21 Nov 2014 02:42:23 +0000 (18:42 -0800)]
fall back to dm-crypt if device already encrypted
Devices already encrypted with aes-cbc-essiv:sha256 will continue to be
decrypted in software, until a factory data reset. New devices that
implement CONFIG_HW_DISK_ENCRYPTION will switch to aes-xts.
b/
17475056 Enable hardware crypto for userdata encryption
Change-Id: I62d1583bdaf7ff06b87e386e758fa3b18c719bca
Signed-off-by: Iliyan Malchev <malchev@google.com>
Ajay Dudani [Thu, 18 Sep 2014 04:02:52 +0000 (21:02 -0700)]
Adding support of dm-req-crypt
Currently Android provides disk encryption support using dm-crypt
which is based on bios. dm-crypt uses 512 bytes packet size for
crypto operations. While 512 bytes size packet is ok for SW based
disk encryption, it is inefficient for HW based crypto engines.
dm-req-crypt is similar to dm-crypt except it uses block requests
rathe bios for crypto operations. block requests when unpacked
carries data upto 512KB. Hence, HW based crypto engine can be used
more efficiently.
Also move create disk encryption key before framework start as
HW based disk encryption creates key in secure side. Key creation
can take sometime to create the key securely. If framework is
started before creating the key, it is possible that framework
requests service from secure side. Secure side can serve mostly one
request at a time. Secure side may reject framework request if key
creation request is still going on. This may cause problem in the
system
b/
17475056 Enable hardware crypto for userdata encryption
Change-Id: I5480ab72a37c02532218a18faaba598a824589fd
Signed-off-by: Iliyan Malchev <malchev@google.com>
Iliyan Malchev [Fri, 21 Nov 2014 02:42:23 +0000 (18:42 -0800)]
fall back to dm-crypt if device already encrypted
Devices already encrypted with aes-cbc-essiv:sha256 will continue to be
decrypted in software, until a factory data reset. New devices that
implement CONFIG_HW_DISK_ENCRYPTION will switch to aes-xts.
b/
17475056 Enable hardware crypto for userdata encryption
Change-Id: I62d1583bdaf7ff06b87e386e758fa3b18c719bca
Signed-off-by: Iliyan Malchev <malchev@google.com>
Ajay Dudani [Thu, 18 Sep 2014 04:02:52 +0000 (21:02 -0700)]
Adding support of dm-req-crypt
Currently Android provides disk encryption support using dm-crypt
which is based on bios. dm-crypt uses 512 bytes packet size for
crypto operations. While 512 bytes size packet is ok for SW based
disk encryption, it is inefficient for HW based crypto engines.
dm-req-crypt is similar to dm-crypt except it uses block requests
rathe bios for crypto operations. block requests when unpacked
carries data upto 512KB. Hence, HW based crypto engine can be used
more efficiently.
Also move create disk encryption key before framework start as
HW based disk encryption creates key in secure side. Key creation
can take sometime to create the key securely. If framework is
started before creating the key, it is possible that framework
requests service from secure side. Secure side can serve mostly one
request at a time. Secure side may reject framework request if key
creation request is still going on. This may cause problem in the
system
b/
17475056 Enable hardware crypto for userdata encryption
Change-Id: I5480ab72a37c02532218a18faaba598a824589fd
Signed-off-by: Iliyan Malchev <malchev@google.com>
The Android Automerger [Sat, 8 Nov 2014 14:15:54 +0000 (06:15 -0800)]
merge in lmp-mr1-release history after reset to
7c49ab0a0b3c1ee9b24a4b0b1a2c0a8c86acea41
The Android Automerger [Thu, 6 Nov 2014 14:18:22 +0000 (06:18 -0800)]
merge in lmp-mr1-release history after reset to
7c49ab0a0b3c1ee9b24a4b0b1a2c0a8c86acea41
The Android Automerger [Wed, 5 Nov 2014 14:15:25 +0000 (06:15 -0800)]
merge in lmp-mr1-release history after reset to
13c3a90b586d272b391bd0e2795717db75a4d853
Shawn Willden [Thu, 30 Oct 2014 14:12:32 +0000 (08:12 -0600)]
Modify vold to check for hardware keymaster.
vold should only use hardware keymaster implementations to protect the
disk encryption key, because there's little value in using the software
implementation. More importantly, if we allow vold to use softkeymaster
in the absence of a HW keymaster and (somehow) a HW keymaster is added
to a device, the HW version will be loaded, and will be unable to use
the softkeymaster key found in the crypto footer, forcing a factory
reset.
This CL will not break devices without HW keymaster, because
softkeymaster currently reports its keys as non-standalone (which isn't
correct). After this CL is in, I will fix softkeymaster.
Bug:
17362157
Change-Id: I98b169e7a59ff7d44b72069b87743463ec823ea2
The Android Automerger [Tue, 4 Nov 2014 14:15:17 +0000 (06:15 -0800)]
merge in lmp-mr1-release history after reset to
13c3a90b586d272b391bd0e2795717db75a4d853
The Android Automerger [Mon, 3 Nov 2014 14:13:22 +0000 (06:13 -0800)]
merge in lmp-mr1-release history after reset to
13c3a90b586d272b391bd0e2795717db75a4d853
The Android Automerger [Sun, 2 Nov 2014 14:12:44 +0000 (06:12 -0800)]
merge in lmp-mr1-release history after reset to
13c3a90b586d272b391bd0e2795717db75a4d853
The Android Automerger [Sat, 1 Nov 2014 13:13:30 +0000 (06:13 -0700)]
merge in lmp-mr1-release history after reset to
13c3a90b586d272b391bd0e2795717db75a4d853
The Android Automerger [Thu, 30 Oct 2014 13:14:30 +0000 (06:14 -0700)]
merge in lmp-mr1-release history after reset to
13c3a90b586d272b391bd0e2795717db75a4d853
Rubin Xu [Wed, 29 Oct 2014 15:41:23 +0000 (15:41 +0000)]
Merge "Make persistent field in cryptofs support longer values." into lmp-mr1-dev
The Android Automerger [Wed, 29 Oct 2014 13:12:32 +0000 (06:12 -0700)]
merge in lmp-mr1-release history after reset to
ada1f9290fc266f5277fbed88b02faf2a4f93ff8
The Android Automerger [Tue, 28 Oct 2014 13:17:25 +0000 (06:17 -0700)]
merge in lmp-mr1-release history after reset to
ada1f9290fc266f5277fbed88b02faf2a4f93ff8
The Android Automerger [Mon, 27 Oct 2014 13:11:52 +0000 (06:11 -0700)]
merge in lmp-mr1-release history after reset to
ada1f9290fc266f5277fbed88b02faf2a4f93ff8
The Android Automerger [Sun, 26 Oct 2014 13:11:42 +0000 (06:11 -0700)]
merge in lmp-mr1-release history after reset to
ada1f9290fc266f5277fbed88b02faf2a4f93ff8
The Android Automerger [Sat, 25 Oct 2014 13:12:55 +0000 (06:12 -0700)]
merge in lmp-mr1-release history after reset to
ada1f9290fc266f5277fbed88b02faf2a4f93ff8
Rubin Xu [Mon, 13 Oct 2014 11:49:54 +0000 (12:49 +0100)]
Make persistent field in cryptofs support longer values.
Store long field values in multiple underlying fixed-length entries
and concatenate them together when reading back.
Bug:
17556485
Change-Id: I2f8033d18c208993fa1b010712be0dad5d8b646b
The Android Automerger [Thu, 23 Oct 2014 13:14:39 +0000 (06:14 -0700)]
merge in lmp-mr1-release history after reset to
ada1f9290fc266f5277fbed88b02faf2a4f93ff8
The Android Automerger [Wed, 22 Oct 2014 13:12:31 +0000 (06:12 -0700)]
merge in lmp-mr1-release history after reset to
ada1f9290fc266f5277fbed88b02faf2a4f93ff8
The Android Automerger [Tue, 21 Oct 2014 13:15:14 +0000 (06:15 -0700)]
merge in lmp-mr1-release history after reset to
ada1f9290fc266f5277fbed88b02faf2a4f93ff8
The Android Automerger [Mon, 20 Oct 2014 13:12:34 +0000 (06:12 -0700)]
merge in lmp-mr1-release history after reset to
ada1f9290fc266f5277fbed88b02faf2a4f93ff8
The Android Automerger [Sun, 19 Oct 2014 13:11:19 +0000 (06:11 -0700)]
merge in lmp-mr1-release history after reset to
ada1f9290fc266f5277fbed88b02faf2a4f93ff8
The Android Automerger [Sat, 18 Oct 2014 13:13:05 +0000 (06:13 -0700)]
merge in lmp-mr1-release history after reset to
ada1f9290fc266f5277fbed88b02faf2a4f93ff8
JP Abgrall [Fri, 17 Oct 2014 18:50:39 +0000 (18:50 +0000)]
am
512f0d52: cryptfs: [HACK] reboot if the crypto block dev failed to open
* commit '
512f0d52ac5f85b327872e085d9fe6f02517eadf':
cryptfs: [HACK] reboot if the crypto block dev failed to open
JP Abgrall [Fri, 17 Oct 2014 18:41:56 +0000 (11:41 -0700)]
resolved conflicts for merge of
7776871d to lmp-mr1-dev
This change was already in lmp-mr1-dev
JP Abgrall [Sat, 11 Oct 2014 01:43:41 +0000 (18:43 -0700)]
cryptfs: [HACK] reboot if the crypto block dev failed to open
There are cases where the /dev/block/dm-0 fails to open.
This leads to the device not completing the boot up sequence.
Currently, the only way out is to reboot.
Bug:
17898962
Change-Id: If4583ebb1ef1ebdbaf680d69b876459aaec2f4ce
(cherry picked from commit
7fc1de8a44307d6c51826ab90f804702e08d1e6d)
The Android Automerger [Thu, 16 Oct 2014 13:14:00 +0000 (06:14 -0700)]
merge in lmp-mr1-release history after reset to
7fc1de8a44307d6c51826ab90f804702e08d1e6d
The Android Automerger [Wed, 15 Oct 2014 13:14:27 +0000 (06:14 -0700)]
merge in lmp-mr1-release history after reset to
7fc1de8a44307d6c51826ab90f804702e08d1e6d
The Android Automerger [Tue, 14 Oct 2014 13:13:18 +0000 (06:13 -0700)]
merge in lmp-mr1-release history after reset to
7fc1de8a44307d6c51826ab90f804702e08d1e6d
The Android Automerger [Mon, 13 Oct 2014 13:12:46 +0000 (06:12 -0700)]
merge in lmp-mr1-release history after reset to
fc61504166d4377a1f83211c236ca11260da1261
The Android Automerger [Sun, 12 Oct 2014 13:11:57 +0000 (06:11 -0700)]
merge in lmp-mr1-release history after reset to
fc61504166d4377a1f83211c236ca11260da1261
The Android Automerger [Sat, 11 Oct 2014 13:11:59 +0000 (06:11 -0700)]
merge in lmp-mr1-release history after reset to
fc61504166d4377a1f83211c236ca11260da1261
JP Abgrall [Sat, 11 Oct 2014 01:43:41 +0000 (18:43 -0700)]
cryptfs: [HACK] reboot if the crypto block dev failed to open
There are cases where the /dev/block/dm-0 fails to open.
This leads to the device not completing the boot up sequence.
Currently, the only way out is to reboot.
Bug:
17898962
Change-Id: If4583ebb1ef1ebdbaf680d69b876459aaec2f4ce
JP Abgrall [Fri, 10 Oct 2014 22:52:11 +0000 (15:52 -0700)]
cryptfs: extra debugging around crypto blockdev dm-... errors.
Some times the /dev/block/dm-0 fails to open after it has been setup.
Log why.
Bug:
17576594
Bug:
17942270
Change-Id: If0bbfe22d84137f2029bacb10873832038f0d36c
JP Abgrall [Fri, 10 Oct 2014 22:52:11 +0000 (15:52 -0700)]
cryptfs: extra debugging around crypto blockdev dm-... errors.
Some times the /dev/block/dm-0 fails to open after it has been setup.
Log why.
Bug:
17576594
Bug:
17942270
Change-Id: If0bbfe22d84137f2029bacb10873832038f0d36c
The Android Automerger [Thu, 9 Oct 2014 13:12:53 +0000 (06:12 -0700)]
merge in lmp-mr1-release history after reset to
fc61504166d4377a1f83211c236ca11260da1261
The Android Automerger [Wed, 8 Oct 2014 13:16:42 +0000 (06:16 -0700)]
merge in lmp-mr1-release history after reset to
fc61504166d4377a1f83211c236ca11260da1261
The Android Automerger [Tue, 7 Oct 2014 13:13:55 +0000 (06:13 -0700)]
merge in lmp-mr1-release history after reset to
fc61504166d4377a1f83211c236ca11260da1261
Paul Lawrence [Sat, 4 Oct 2014 22:32:29 +0000 (15:32 -0700)]
Remove possibility of zero chars from passwords
scrypt pads the password with zeros. Our patterns use 0 to represent
the top left dot. So patterns that end there are equivalent to ones
that end one short.
After much thought, the best solution is to change the way we
represent patterns in keyguard. This, however, is a big change.
The short term solution is to change the pattern representation in vold
so that we are storing the correct thing. Later we will change keyguard
to handle patterns correctly and remove quite a few hacks from vold
(use of hex, this code). b/
17840293 created to track this.
Bug:
17751714
Change-Id: I30cdffb0f0db406d2e2b6c54d4153d120d975318
The Android Automerger [Mon, 6 Oct 2014 13:14:08 +0000 (06:14 -0700)]
merge in lmp-mr1-release history after reset to
7639a6ab60426bbfa57c750c1ff0b4016cad0294
Paul Lawrence [Sun, 5 Oct 2014 23:24:46 +0000 (23:24 +0000)]
Merge "Reset failed decryption count on successful decryptions" into lmp-dev
Paul Lawrence [Sun, 5 Oct 2014 19:57:37 +0000 (12:57 -0700)]
Reset failed decryption count on successful decryptions
Bug:
17866359
Change-Id: I1af2ff1ac4f5243afba0cfa2f2d3a1d0b029091b
The Android Automerger [Sun, 5 Oct 2014 13:13:16 +0000 (06:13 -0700)]
merge in lmp-mr1-release history after reset to
6e8440fd5072a673dd861ffb531fc17b4673ad90
The Android Automerger [Sat, 4 Oct 2014 13:13:29 +0000 (06:13 -0700)]
merge in lmp-mr1-release history after reset to
6e8440fd5072a673dd861ffb531fc17b4673ad90
Greg Hackmann [Fri, 3 Oct 2014 00:18:20 +0000 (17:18 -0700)]
cryptfs: kill processes with open files on tmpfs /data
cryptfs will fail to remount /data at boot if any processes (e.g.
dex2oat) have files open on the tmpfs /data partition. Since these
files are about to be destroyed anyway, just kill the offending
processes: first with SIGHUP and finally with SIGKILL.
Also remove a stray i++ that effectively cut the number of retries in
half.
Bug:
17576594
Change-Id: I76fb90ce2e52846ffb9de706e52b7bde98b4186a
Signed-off-by: Greg Hackmann <ghackmann@google.com>
The Android Automerger [Thu, 2 Oct 2014 13:19:01 +0000 (06:19 -0700)]
merge in lmp-mr1-release history after reset to
9c58a871f9fb356409d3b90734bf706d1463f041
The Android Automerger [Wed, 1 Oct 2014 13:17:03 +0000 (06:17 -0700)]
merge in lmp-mr1-release history after reset to
3574b085f46a5b22ee660a9fd3ef727a20c106ee
Paul Lawrence [Tue, 30 Sep 2014 16:12:51 +0000 (09:12 -0700)]
Use monotonic clock for cryptfs progress
Otherwise we get strange results when the time changes. Worst
effect is that the encryption takes a lot longer since we are
calling the logging code far more frequently.
Bug:
17625981
Change-Id: Ice29f28b3720e9e4a1ea28e45eeab574d1959ec1
The Android Automerger [Tue, 30 Sep 2014 13:19:03 +0000 (06:19 -0700)]
merge in lmp-mr1-release history after reset to
3574b085f46a5b22ee660a9fd3ef727a20c106ee
The Android Automerger [Mon, 29 Sep 2014 13:19:00 +0000 (06:19 -0700)]
merge in lmp-mr1-release history after reset to
3574b085f46a5b22ee660a9fd3ef727a20c106ee
The Android Automerger [Sun, 28 Sep 2014 13:12:30 +0000 (06:12 -0700)]
merge in lmp-mr1-release history after reset to
3574b085f46a5b22ee660a9fd3ef727a20c106ee
The Android Automerger [Sat, 27 Sep 2014 13:13:47 +0000 (06:13 -0700)]
merge in lmp-mr1-release history after reset to
3574b085f46a5b22ee660a9fd3ef727a20c106ee
The Android Automerger [Thu, 25 Sep 2014 13:18:11 +0000 (06:18 -0700)]
merge in lmp-mr1-release history after reset to
3846be17feba13150a5db22204622db6a762a0d8
Greg Hackmann [Wed, 24 Sep 2014 23:32:00 +0000 (23:32 +0000)]
Merge "cryptfs: log umount() failure reason" into lmp-dev
Greg Hackmann [Wed, 24 Sep 2014 23:31:50 +0000 (23:31 +0000)]
Merge "print information about opened files when failed unmount" into lmp-dev
Greg Hackmann [Wed, 24 Sep 2014 21:55:20 +0000 (14:55 -0700)]
cryptfs: log umount() failure reason
Bug:
17576594
Change-Id: I7320aa597210896b4db6e663e1b2cb0c24d96557
Signed-off-by: Greg Hackmann <ghackmann@google.com>
jessica_yu [Mon, 22 Sep 2014 07:57:40 +0000 (15:57 +0800)]
print information about opened files when failed unmount
Change-Id: I88ae719cdae490433390d624f75612a9f4f96677
Cryptfs : Enabling support for allow_discards in dmcrypt.
Cryptfs : Password matches
Cryptfs : test_mount_encrypted_fs(): Master key saved
TrustyKeymaster: Creating device
TrustyKeymaster: Device address: 0x7f8f416100
Cryptfs : keymaster version is 3
Cryptfs : Just asked init to shut down class main
ServiceManager: service 'drm.drmManager' died
ServiceManager: service 'media.audio_flinger' died
ServiceManager: service 'media.player' died
ServiceManager: service 'media.camera' died
ServiceManager: service 'android.security.keystore' died
Cryptfs : unmounting /data failed
Bug:
17576594
Jeff Sharkey [Wed, 24 Sep 2014 18:46:51 +0000 (11:46 -0700)]
Include reason when wiping data.
This will help us track down who requested a data wipe.
Bug:
17412160
Change-Id: I5ab39a4de03c973ed151d703d6462a172ee043fd
The Android Automerger [Wed, 24 Sep 2014 13:17:18 +0000 (06:17 -0700)]
merge in lmp-mr1-release history after reset to
3846be17feba13150a5db22204622db6a762a0d8
The Android Automerger [Tue, 23 Sep 2014 22:17:24 +0000 (15:17 -0700)]
merge in lmp-mr1-release history after reset to
3846be17feba13150a5db22204622db6a762a0d8
The Android Automerger [Tue, 23 Sep 2014 11:47:18 +0000 (04:47 -0700)]
merge in lmp-mr1-release history after reset to
8e3f4510a88871a2d489ca4cdf7b738d4229053d