OSDN Git Service
Jim Miller [Fri, 15 Aug 2014 02:00:45 +0000 (02:00 +0000)]
Revert "cryptfs: Added support for f2fs fast encryption"
This reverts commit
74c01201dec12b5de43ba0f20a2f38e835cd00af.
Change-Id: Ib397a2b5812179ee2e2b68de5d718077563adc1c
Daniel Rosenberg [Wed, 13 Aug 2014 08:56:18 +0000 (01:56 -0700)]
cryptfs: Added support for f2fs fast encryption
Bug:
15749466
Change-Id: I25452a05e1cbe90ac6603a89db9b720c7ab17e55
Signed-off-by: Daniel Rosenberg <drosen@google.com>
Paul Lawrence [Fri, 8 Aug 2014 21:28:10 +0000 (14:28 -0700)]
Wipe userdata when password is good but it won't mount
Store salted scrypt of intermediate key in crypto header
When mount fails, check if matches, and if it does return error
code prompting a wipe
Bug:
11477689
Change-Id: I3dcf9e0c64f2a01c8ba8eaf58df82cbe717d421b
JP Abgrall [Fri, 8 Aug 2014 01:44:37 +0000 (18:44 -0700)]
fstrim: Use a local definition of the IOCTL FIDTRIM number
As it is not upstream, it doesn't belong in the external/kernel-headers
... or in bionic's cleaned up copy.
It matches what is in common/android-3.10.
Bug:
15593563
Change-Id: I6fa22cd823a88805ec57f973813ac69291069c7d
JP Abgrall [Thu, 7 Aug 2014 23:50:44 +0000 (16:50 -0700)]
fstrim: fix typo in log message for FIDTRIM case
Bug:
15593563
Change-Id: I2b5fbbfb694e1b87de6c14ab63f1a5f803bbbc36
Paul Lawrence [Mon, 28 Jul 2014 19:47:22 +0000 (12:47 -0700)]
When encryption fails, reboot into recovery
Set flag on starting encryption to say it failed, and only clear
when we get into a recoverable state (partially or fully encrypted.)
Go to recovery on seeing this flag on boot
Bug:
16552363
Change-Id: I7e452b653edf3a087ecfaba8f81f41765a1c8daf
JP Abgrall [Tue, 29 Jul 2014 20:24:56 +0000 (13:24 -0700)]
fstrim: prep for supporting a deep trim ioctl
This adds an "fstrim dodtrim" command which will attempt to use
the FIDTRIM ioctl() if FIDTRIM is defined in the uapi/linux/fs.h.
If not, it will fail with EINVAL.
If no FIDTRIM is defined, it does not affect the "fstrim dotrim".
Change-Id: Icbfd621abb592b170db06f749e5eedfd1175f723
Cylen Yao [Tue, 22 Jul 2014 02:34:49 +0000 (10:34 +0800)]
Fix failure erasing SD in Factory reset
Initialize mIsDecrypted to prevent from formatting SD failure
Change-Id: I30851e6b01b0999bf0b8c1e4b8e3f3a976a41ad1
Signed-off-by: Cylen Yao <cylen.yao@mediatek.com>
(cherry picked from commit
5dbcbd03149af50db42dadeebf565333ce399182)
JP Abgrall [Fri, 25 Jul 2014 01:02:16 +0000 (18:02 -0700)]
vold: support "volume list [broadcast]" command
Sometimes when an sdcard is already mounted,
some info like uuid and label are not re-broadcast to new listeners.
The extra argument to list allows late listeners to catch up by asking
volume list to broadcast that info again.
Bug:
16253597
Bug:
16306775
Change-Id: Ie7d0c1132c22d307a5b2a0e50075a3716138d00b
Signed-off-by: Benson Huang <benson.huang@mediatek.com>
(cherry picked from commit
85f4700f44170b772697e627b3075dcb9137e1b7)
Daniel Rosenberg [Thu, 26 Jun 2014 22:35:24 +0000 (15:35 -0700)]
Fat.cpp: Tuned FAT parameters according to SD Association recommendations.
Updated cluster size to be 32k, and aligned the starting cluster of the root
directory to be cluster aligned.
Change-Id: I759997569f7a0263a076cc462b235a6cf54e0c5f
Signed-off-by: Daniel Rosenberg <drosen@google.com>
Elliott Hughes [Thu, 26 Jun 2014 01:36:19 +0000 (18:36 -0700)]
Fix an accidental PRId64 to PRIx64.
Change-Id: Ic5313289d826bac74c3466b33f1f167a8f0955ad
Elliott Hughes [Thu, 26 Jun 2014 01:25:11 +0000 (18:25 -0700)]
resolved conflicts for merge of
afa60cee to master
Change-Id: I1568def8839bed4d4d2dadbd97194d5603edc627
Elliott Hughes [Thu, 26 Jun 2014 00:37:45 +0000 (00:37 +0000)]
am
c0c28675: Merge "Fix vold %lld to PRId64."
* commit '
c0c2867518eed4539444434c95fad8185a6ac08e':
Fix vold %lld to PRId64.
Elliott Hughes [Thu, 26 Jun 2014 00:28:33 +0000 (00:28 +0000)]
Merge "Fix vold %lld to PRId64."
Elliott Hughes [Thu, 26 Jun 2014 00:27:42 +0000 (17:27 -0700)]
Fix vold %lld to PRId64.
Change-Id: I6eb9f21fff124b8b22f4fae2ac74c2b41d93b384
JP Abgrall [Mon, 16 Jun 2014 20:01:23 +0000 (13:01 -0700)]
cryptfs: makefs F2FS if the partition type is F2FS.
When a crypto is enabled with a wipe flag (obsolete?),
it will correctly handle the fstab's choice for the fs type.
Remove the dead code for FAT_FS which was un-invocable.
Change-Id: I8d141a0d4d14df9fe84d3b131484e9696fcd8870
Signed-off-by: JP Abgrall <jpa@google.com>
Daniel Rosenberg [Wed, 11 Jun 2014 00:16:03 +0000 (17:16 -0700)]
Increase asec image size for reflecting ext4 reserved clusters
From Shawn Heo's patch:
Ext4 introduced reserved clusters to prevent costly zeroout, or
unexpected ENOSPC. The size is 2% or 4096 clusters, whichever
is smaller (http://lwn.net/Articles/546473/).
So, we need to allocate additionally this amount of free space
to asecs when vold create asec images. This is required when
Android runs on Linux kernel 3.10 or later.
see: https://android-review.git.corp.google.com/#/c/96160
Change-Id: Iacff16b8cf0314493c355fa741bcfa519f744d6c
Signed-off-by: Daniel Rosenberg <drosen@google.com>
Daniel Rosenberg [Thu, 22 May 2014 18:23:56 +0000 (11:23 -0700)]
Added support for ext4 ASEC resizing.
ASECs formatted as ext4 can now be resized using vdc asec resize.
Refactored some common code.
Requires resize2fs.
Change-Id: Ie78bb6015114a7bc4af42b16d1f299322ffc1e2a
Signed-off-by: Daniel Rosenberg <drosen@google.com>
Paul Lawrence [Mon, 9 Jun 2014 21:10:09 +0000 (14:10 -0700)]
On low power turn off rather than rebooting to allow device to charge
The code was using encrypted_upto == 0 as an indicator that encryption
has succeeded. This meant that if no encryption happened, we would reboot
continually.
We now set encrypted_upto to fs_size when encryption is complete.
Also don't start to encrypt unless we are at 10% power. Stop when we
get to 5% power. This should lead to partial encryptions only very
rarely.
Bug:
15513202
Change-Id: I6214d78579d1fbbe2f63ee8862473d86a89d29b3
The Android Automerger [Fri, 6 Jun 2014 15:42:06 +0000 (15:42 +0000)]
am
df293f14: merge in master-release history after reset to
b31f33b5e41bf295705b8f0c1582c6277e8fec64
* commit '
df293f14f5bdb4f572c7f836ebb0802a177836ff':
Fix encryption on Nakasi
Dan Albert [Thu, 5 Jun 2014 20:33:07 +0000 (20:33 +0000)]
am
ea256025: am
45faade2: Merge "Replaces uses of index() with strchr()."
* commit '
ea256025669f4a5dd8c59e4c70ec7154a198be48':
Replaces uses of index() with strchr().
Dan Albert [Thu, 5 Jun 2014 20:29:33 +0000 (20:29 +0000)]
am
45faade2: Merge "Replaces uses of index() with strchr()."
* commit '
45faade28ae9e245e7c611c26990254aba006d2a':
Replaces uses of index() with strchr().
Dan Albert [Thu, 5 Jun 2014 19:56:03 +0000 (19:56 +0000)]
Merge "Replaces uses of index() with strchr()."
Paul Lawrence [Wed, 4 Jun 2014 21:05:01 +0000 (14:05 -0700)]
Calculate time to go while encrypting
@bug
15159008
Change-Id: I6a96eeab180dceb0613202ba5d252036a0d5376f
Paul Lawrence [Wed, 4 Jun 2014 20:12:21 +0000 (13:12 -0700)]
Show correct percentage when encrypting used blocks only
Bug:
12975202
Change-Id: I7e4adfa2c4951055bbb2c11986a7784f465f586f
Dan Albert [Thu, 5 Jun 2014 18:44:40 +0000 (11:44 -0700)]
Replaces uses of index() with strchr().
Bionic is removing index() because it was removed from POSIX 2008.
Change-Id: I704fb8962ff2c08b8f12245d2db2118d410826b0
Daniel Rosenberg [Fri, 23 May 2014 20:47:00 +0000 (13:47 -0700)]
Fixed bugs with ASEC filesystem.
Changed ext4 to be 4kb aligned, and fat to be 32kb aligned.
Fixed issue that could potentially cause unencrypted ext4
ASECS to overwrite the ASEC super block when filled.
Change-Id: I890426c82ac9cbc65add85a8e3f5063504193c31
Signed-off-by: Daniel Rosenberg <drosen@google.com>
JP Abgrall [Tue, 27 May 2014 19:28:07 +0000 (19:28 +0000)]
am
099b20f3: am
1881395b: am
c6752b06: Merge "vold: wildcard support for device path matching"
* commit '
099b20f3ce42a49ba49a1a70a818047ea59612ad':
vold: wildcard support for device path matching
JP Abgrall [Tue, 27 May 2014 19:24:03 +0000 (19:24 +0000)]
am
1881395b: am
c6752b06: Merge "vold: wildcard support for device path matching"
* commit '
1881395b696017dfb40a01e718cc8dc2ea7a38e9':
vold: wildcard support for device path matching
JP Abgrall [Tue, 27 May 2014 19:21:48 +0000 (19:21 +0000)]
am
c6752b06: Merge "vold: wildcard support for device path matching"
* commit '
c6752b06987207bd69b12ad1feadd358e296d52e':
vold: wildcard support for device path matching
JP Abgrall [Tue, 27 May 2014 19:19:32 +0000 (19:19 +0000)]
Merge "vold: wildcard support for device path matching"
The Android Automerger [Thu, 22 May 2014 14:22:42 +0000 (07:22 -0700)]
merge in master-release history after reset to
b31f33b5e41bf295705b8f0c1582c6277e8fec64
The Android Automerger [Thu, 22 May 2014 12:51:14 +0000 (05:51 -0700)]
merge in master-release history after reset to
b31f33b5e41bf295705b8f0c1582c6277e8fec64
The Android Automerger [Wed, 21 May 2014 12:51:09 +0000 (05:51 -0700)]
merge in master-release history after reset to
b31f33b5e41bf295705b8f0c1582c6277e8fec64
The Android Automerger [Tue, 20 May 2014 12:51:25 +0000 (05:51 -0700)]
merge in master-release history after reset to
b31f33b5e41bf295705b8f0c1582c6277e8fec64
The Android Automerger [Mon, 19 May 2014 12:50:25 +0000 (05:50 -0700)]
merge in master-release history after reset to
b31f33b5e41bf295705b8f0c1582c6277e8fec64
The Android Automerger [Sun, 18 May 2014 12:50:13 +0000 (05:50 -0700)]
merge in master-release history after reset to
b31f33b5e41bf295705b8f0c1582c6277e8fec64
The Android Automerger [Sat, 17 May 2014 12:51:52 +0000 (05:51 -0700)]
merge in master-release history after reset to
b31f33b5e41bf295705b8f0c1582c6277e8fec64
Cylen Yao [Mon, 12 May 2014 07:56:14 +0000 (15:56 +0800)]
Support non-sequential partition index
Add support for the storage with non-sequential partition index
Ex: if using extended partition, the index of the partition will be greater than 5
[toddpoynor@google.com: fixup mPendingPartCount data type]
Change-Id: I5dbc870fbaac24045f5b994fcb899d5df73c6a55
Todd Poynor [Tue, 13 May 2014 02:10:53 +0000 (19:10 -0700)]
Updates for BatteryProperty 64-bit property values
Change-Id: I4838d384e14a7c2c0b607c0bd693e9c7bef75fb7
The Android Automerger [Thu, 15 May 2014 12:51:29 +0000 (05:51 -0700)]
merge in master-release history after reset to
8c008397141bf9a7d619eb2c53452bf3e397da39
Cylen Yao [Fri, 2 May 2014 11:23:42 +0000 (19:23 +0800)]
avoid fs_mkdirs when SD card removed
Must limit vold calls to fs_mkdirs() only when the volume is mounted.
If NOT, it will trigger selinux warning as follows.
audit(
1398835637.785:8): avc: denied { write } for pid=137 comm="vold" name="sdcard0" dev="rootfs" ino=3191 scontext=u:r:vold:s0 tcontext=u:object_r:rootfs:s0 tclass=dir
Change-Id: I1113fc961cbdd8bbd2fcbf740c2f504628c8399d
Signed-off-by: Cylen Yao <cylen.yao@mediatek.com>
The Android Automerger [Wed, 14 May 2014 12:51:48 +0000 (05:51 -0700)]
merge in master-release history after reset to
8c008397141bf9a7d619eb2c53452bf3e397da39
The Android Automerger [Tue, 13 May 2014 12:51:16 +0000 (05:51 -0700)]
merge in master-release history after reset to
8c008397141bf9a7d619eb2c53452bf3e397da39
The Android Automerger [Mon, 12 May 2014 12:50:20 +0000 (05:50 -0700)]
merge in master-release history after reset to
8c008397141bf9a7d619eb2c53452bf3e397da39
The Android Automerger [Sun, 11 May 2014 12:50:08 +0000 (05:50 -0700)]
merge in master-release history after reset to
8c008397141bf9a7d619eb2c53452bf3e397da39
The Android Automerger [Sat, 10 May 2014 12:51:27 +0000 (05:51 -0700)]
merge in master-release history after reset to
8c008397141bf9a7d619eb2c53452bf3e397da39
The Android Automerger [Thu, 8 May 2014 12:51:02 +0000 (05:51 -0700)]
merge in master-release history after reset to
8c008397141bf9a7d619eb2c53452bf3e397da39
Paul Lawrence [Tue, 6 May 2014 21:02:48 +0000 (14:02 -0700)]
Fix encryption on Nakasi
We need to make sure we don't try to read the flags on keymaster
version 2 or below, or we get random junk.
Requires
https://googleplex-android-review.git.corp.google.com/#/c/460689/
Bug:
14384714
Change-Id: I5a4ede1bec0347b8319cedaae6535201c122cf48
Paul Lawrence [Tue, 6 May 2014 21:02:48 +0000 (14:02 -0700)]
Fix encryption on Nakasi
We need to make sure we don't try to read the flags on keymaster
version 2 or below, or we get random junk.
Requires
https://googleplex-android-review.git.corp.google.com/#/c/460689/
Bug:
14384714
Change-Id: I5a4ede1bec0347b8319cedaae6535201c122cf48
Octavian Purdila [Mon, 5 May 2014 12:13:12 +0000 (15:13 +0300)]
vold: wildcard support for device path matching
Switching the kernel to the new sysfs layout (unselecting
CONFIG_SYSFS_DEPRECATED) complicates VolD block device recognition.
The uevents are reporting full specific paths, such as:
/devices/pci0000:0e/0000:0e:18.0/mmc_host/mmc0/mmc0:1234/block/mmcblk0
Because the full device path may contain variable IDs (in this MMC
case "1234") using full path entries in fstab does not work. Android
supports partial matches but only as a prefix at the beginning of the
path.
This patch adds support for matching shell wildcard patterns via
fnmatch(). The prefix matching rule is preserved, but if it is
detected a warning is issued.
Change-Id: Ia0c5eddec06bd71bec6ce838be3b5345278e0bab
Author: Octavian Purdila <octavian.purdila@intel.com>
Signed-off-by: Radu Moisan <radu.moisan@intel.com>
Signed-off-by: Jim Bride <jim.bride@intel.com>
Reviewed-by: Bergeron, Michael <michael.bergeron@intel.com>
Tested-by: Uyyala, Sridhar <sridhar.uyyala@intel.com>
Reviewed-by: Leung, Daniel <daniel.leung@intel.com>
Reviewed-by: Uyyala, Sridhar <sridhar.uyyala@intel.com>
JP Abgrall [Wed, 30 Apr 2014 12:50:51 +0000 (12:50 +0000)]
am
2d3c0c05: am
a821d50b: am
470f0b3f: Merge "Avoid segv by checking argc in "storage user <mountpoint>""
* commit '
2d3c0c05e9cce7bad6afd3ceacca85b297367894':
Nick Kralevich [Wed, 30 Apr 2014 12:50:50 +0000 (12:50 +0000)]
am
a7a612bf: am
15c3e01e: am
3c0d02aa: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
* commit '
a7a612bf9b302962908f709ccc27a781356ac73b':
Mark Salyzyn [Wed, 30 Apr 2014 12:50:50 +0000 (12:50 +0000)]
am
598fdf7a: am
3d9b98cc: am
1dc1fb4a: Merge "vold: suppress unused argument warning messages"
* commit '
598fdf7abe087a3f45b5ab0c932ad339b2e5bb4a':
Nick Kralevich [Wed, 30 Apr 2014 12:50:49 +0000 (12:50 +0000)]
am
e8a19bdb: am
9aace96c: am
311edc8c: Merge "Add SELinux restorecon calls on ASEC containers."
* commit '
e8a19bdba03cdb323732fc9d4178456a87ee11d5':
Colin Cross [Wed, 30 Apr 2014 12:50:49 +0000 (12:50 +0000)]
am
02cb9f5e: am
4c20805a: am
1d8e3ce8: Merge "vold: fix errors inside ALOGV"
* commit '
02cb9f5ea3c1177f89e7403bc253164e4a65cbfe':
JP Abgrall [Wed, 30 Apr 2014 01:00:10 +0000 (01:00 +0000)]
am
a821d50b: am
470f0b3f: Merge "Avoid segv by checking argc in "storage user <mountpoint>""
* commit '
a821d50bd43809414521590ebe65601b823f8095':
Nick Kralevich [Wed, 30 Apr 2014 01:00:10 +0000 (01:00 +0000)]
am
15c3e01e: am
3c0d02aa: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
* commit '
15c3e01e05359fb11ce5e63934d7c3d54d0d6e93':
Mark Salyzyn [Wed, 30 Apr 2014 01:00:09 +0000 (01:00 +0000)]
am
3d9b98cc: am
1dc1fb4a: Merge "vold: suppress unused argument warning messages"
* commit '
3d9b98cc833dc7c07da6bb0cc27926c68b63c276':
Nick Kralevich [Wed, 30 Apr 2014 01:00:09 +0000 (01:00 +0000)]
am
9aace96c: am
311edc8c: Merge "Add SELinux restorecon calls on ASEC containers."
* commit '
9aace96cd0f4606d48d7d9052fb134f80a5c961c':
Colin Cross [Wed, 30 Apr 2014 01:00:08 +0000 (01:00 +0000)]
am
4c20805a: am
1d8e3ce8: Merge "vold: fix errors inside ALOGV"
* commit '
4c20805a33ff194454e5cce3de44943a245e5a44':
Paul Lawrence [Fri, 18 Apr 2014 20:26:10 +0000 (20:26 +0000)]
Merge "Add keymaster support to cryptfs"
Paul Lawrence [Mon, 14 Apr 2014 19:17:14 +0000 (12:17 -0700)]
Add keymaster support to cryptfs
Use keymaster to wrap the cryptfs keys.
Requires selinux change
https://googleplex-android-review.git.corp.google.com/#/c/449411
Bug:
9467042
Change-Id: If25a01cb85ed193a271d61382de0560d85553b7e
Mohamad Ayyash [Wed, 16 Apr 2014 17:54:35 +0000 (17:54 +0000)]
Merge "vdc: fix segfault"
Mohamad Ayyash [Wed, 16 Apr 2014 01:08:05 +0000 (18:08 -0700)]
vdc: fix segfault
Change-Id: I1a35fe15b311d3f5203c5bc02d3db87e942cf554
Paul Lawrence [Fri, 4 Apr 2014 18:11:56 +0000 (18:11 +0000)]
Revert "Revert "Encrypt phone even if pattern or no keyguard""
Don't block based on keyguard type, and pass type to encryption function.
Requires:
https://googleplex-android-review.git.corp.google.com/#/c/444201/
or encryption will no longer work.
This reverts commit
efec3f2927c45979db2b78e7a6228d08aafb5e42.
Change-Id: I431589a56eb11118027e0a5a84f55e973b1084aa
Paul Lawrence [Thu, 3 Apr 2014 20:55:47 +0000 (20:55 +0000)]
Revert "Encrypt phone even if pattern or no keyguard"
This reverts commit
5cc86c57416eccb70dcc949d68587f08726f96fa.
Without two more commits, this will break encryption. I'll re-commit when the other two pass code review.
Change-Id: I71720d065c16cf0f7f534e74ffe883f1e113c477
Paul Lawrence [Wed, 2 Apr 2014 20:34:36 +0000 (13:34 -0700)]
Encrypt phone even if pattern or no keyguard
Add option to enablecrypto to take type, allowing us to set type
when encrypting.
Bug:
13749169
Change-Id: If22fcfa93f1ebd1a5bd3b0077bb3bd8ae71fe819
Paul Lawrence [Mon, 24 Mar 2014 17:51:59 +0000 (17:51 +0000)]
Merge "Fix setfield/getfield"
Paul Lawrence [Fri, 21 Mar 2014 20:40:36 +0000 (20:40 +0000)]
Merge "Store password in vold"
Paul Lawrence [Thu, 20 Feb 2014 20:21:31 +0000 (12:21 -0800)]
Don't corrupt ssd when encrypting and power fails
Stop encryption when battery is low, mark position, and continue on reboot.
Note - support for multiple encrypted volumes removed as no devices seem
to exist with an fstab that uses this feature. If you want support for such
a device, contact me and we will re-add it with appropriate testing.
Bug:
13284213
Change-Id: I1f7178e4f7dd8ea816cbc03ab5c4f6543e98acaa
Paul Lawrence [Mon, 10 Mar 2014 20:20:50 +0000 (13:20 -0700)]
Store password in vold
If we are not to double prompt, we need to pass the password from
CryptKeeper to KeyStore. Since the entire framework is taken down
and restarted, we must store the password in a secure system daemon.
There seems no better way than holding it in vold.
Change-Id: Ia60f2f051fc3f87c4b6468465f17b655f43f97de
Paul Lawrence [Mon, 17 Mar 2014 21:10:51 +0000 (14:10 -0700)]
Fix setfield/getfield
Check for versions >= feature version, not equal
Bug:
13526708
Change-Id: Ie07f6334e6b7c5ca0d7f83ba00827a508e2c2963
JP Abgrall [Thu, 13 Mar 2014 15:54:36 +0000 (15:54 +0000)]
am
470f0b3f: Merge "Avoid segv by checking argc in "storage user <mountpoint>""
* commit '
470f0b3ff46493b4a46b3599db33a29e94615d30':
Avoid segv by checking argc in "storage user <mountpoint>"
Mohamad Ayyash [Wed, 12 Mar 2014 22:06:56 +0000 (22:06 +0000)]
Merge "vold: Add a new mountall command."
JP Abgrall [Wed, 12 Mar 2014 20:35:03 +0000 (20:35 +0000)]
am
a29997ae: am
470f0b3f: Merge "Avoid segv by checking argc in "storage user <mountpoint>""
* commit '
a29997ae260d3d7cf41c40d9c7ba42b761b12d30':
Avoid segv by checking argc in "storage user <mountpoint>"
Mohamad Ayyash [Mon, 10 Mar 2014 22:55:33 +0000 (15:55 -0700)]
vold: Add a new mountall command.
This enables running "vdc mountall" in filesystem recovery tests where a partition is first unmounted then corrupted, and then finally verified that it's properly recovered and remounted successfully (i.e. running e2fsck..etc.).
Change-Id: I9385180afaef70f9cc6b2920d2a3c6ff13203b4e
JP Abgrall [Wed, 12 Mar 2014 18:02:31 +0000 (18:02 +0000)]
am
470f0b3f: Merge "Avoid segv by checking argc in "storage user <mountpoint>""
* commit '
470f0b3ff46493b4a46b3599db33a29e94615d30':
Avoid segv by checking argc in "storage user <mountpoint>"
JP Abgrall [Wed, 12 Mar 2014 17:56:32 +0000 (17:56 +0000)]
Merge "Avoid segv by checking argc in "storage user <mountpoint>""
JP Abgrall [Wed, 12 Mar 2014 17:41:05 +0000 (10:41 -0700)]
Avoid segv by checking argc in "storage user <mountpoint>"
Change-Id: Iffd67746e2e273c4c3f87741e5f13aa511ccb557
Signed-off-by: JP Abgrall <jpa@google.com>
Nick Kralevich [Fri, 7 Mar 2014 02:29:39 +0000 (02:29 +0000)]
am
3c0d02aa: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
* commit '
3c0d02aa03118713e6e770b54d1c530ff866f156':
Convert all selinux_android_restorecon and _setfilecon calls to new API.
Mark Salyzyn [Fri, 7 Mar 2014 02:29:27 +0000 (02:29 +0000)]
am
1dc1fb4a: Merge "vold: suppress unused argument warning messages"
* commit '
1dc1fb4adc71ea9cf26a5033513bd3a1474f79a1':
vold: suppress unused argument warning messages
Nick Kralevich [Fri, 7 Mar 2014 02:26:58 +0000 (02:26 +0000)]
am
311edc8c: Merge "Add SELinux restorecon calls on ASEC containers."
* commit '
311edc8cb2dd5c86bad49f9696333874b400f9c4':
Add SELinux restorecon calls on ASEC containers.
Colin Cross [Fri, 7 Mar 2014 02:25:15 +0000 (02:25 +0000)]
am
1d8e3ce8: Merge "vold: fix errors inside ALOGV"
* commit '
1d8e3ce8da962e5ff98d36e75f6b02873fdddb70':
vold: fix errors inside ALOGV
Nick Kralevich [Mon, 3 Mar 2014 21:21:35 +0000 (21:21 +0000)]
am
706efb22: resolved conflicts for merge of
83755972 to klp-modular-dev-plus-aosp
* commit '
706efb2254b68a6cd2441b519dd8445ca3df362d':
Add SELinux restorecon calls on ASEC containers.
Nick Kralevich [Mon, 3 Mar 2014 21:12:46 +0000 (13:12 -0800)]
resolved conflicts for merge of
83755972 to klp-modular-dev-plus-aosp
Change-Id: I4bf4dd29a65f82f91738526b80d5b579c26f8bfe
Robert Craig [Tue, 4 Feb 2014 15:53:00 +0000 (10:53 -0500)]
Add SELinux restorecon calls on ASEC containers.
This will allow fine-grained labeling of the
contents of ASEC containers. Some of the contents
need to be world readable and thus should be
distinguishable in policy.
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
(cherry picked from commit
b9e3ba56cb4075f894a73b02ee70571456494ac1)
Change-Id: I4614af139991aa086ac14a06c70fe425888a16a1
Paul Lawrence [Fri, 7 Feb 2014 20:07:22 +0000 (12:07 -0800)]
Infrastructure to securely allow only one prompt at boot when encrypted
Add a call to vold that says if we decrypted the data partition. Reset the
flag so that it only returns true the first time.
Bug:
12990752
Change-Id: Ib00be87137c00fb8ad29205c85a3ea187764b702
Paul Lawrence [Mon, 3 Feb 2014 21:28:11 +0000 (13:28 -0800)]
Enable auto-encrypt drive at startup
Modify enablecrypto command to make the password optional. When it is
not there, default encrypt the device.
Remove a warning by making at least some parts of this file const-correct.
Bug:
11985952
Change-Id: Ie27da4c4072386d9d6519d97ff46c6dc4ed188dc
Paul Lawrence [Fri, 14 Feb 2014 15:24:12 +0000 (15:24 +0000)]
Merge "Support default, pattern, pin and password encryption types"
Nick Kralevich [Thu, 13 Feb 2014 00:19:55 +0000 (00:19 +0000)]
am
3214d1f5: am
3c0d02aa: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
* commit '
3214d1f5a4dbece12e00f1c122e4c2e291715706':
Convert all selinux_android_restorecon and _setfilecon calls to new API.
Mark Salyzyn [Thu, 13 Feb 2014 00:19:54 +0000 (00:19 +0000)]
am
49dd24c2: am
1dc1fb4a: Merge "vold: suppress unused argument warning messages"
* commit '
49dd24c238e86c57e97f919af7fbf8ee3d79b737':
vold: suppress unused argument warning messages
Nick Kralevich [Wed, 12 Feb 2014 23:19:02 +0000 (23:19 +0000)]
am
3c0d02aa: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
* commit '
3c0d02aa03118713e6e770b54d1c530ff866f156':
Convert all selinux_android_restorecon and _setfilecon calls to new API.
Mark Salyzyn [Wed, 12 Feb 2014 23:10:33 +0000 (23:10 +0000)]
am
1dc1fb4a: Merge "vold: suppress unused argument warning messages"
* commit '
1dc1fb4adc71ea9cf26a5033513bd3a1474f79a1':
vold: suppress unused argument warning messages
Nick Kralevich [Wed, 12 Feb 2014 23:09:58 +0000 (23:09 +0000)]
Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
Mark Salyzyn [Wed, 12 Feb 2014 23:03:22 +0000 (23:03 +0000)]
Merge "vold: suppress unused argument warning messages"
Paul Lawrence [Wed, 29 Jan 2014 21:31:03 +0000 (13:31 -0800)]
Support default, pattern, pin and password encryption types
Store encryption type in crypto footer, and provide functions to
manipulate it. Add mount_default_encrypted command to vdc to allow
mounting of default encrypted volumes at boot time.
Bug:
8769627
Change-Id: Ie41848f258e128b48b579e09789abfa24c95e2b2
Mark Salyzyn [Wed, 12 Feb 2014 22:16:14 +0000 (14:16 -0800)]
vold: suppress unused argument warning messages
(cherry picked from commit
3e971277db0d87652af5622c989233e7159ab909)
Change-Id: Ic1ab533f756fbd44b1f2e5ae12e2f5736ace7740
Mark Salyzyn [Tue, 21 Jan 2014 21:27:04 +0000 (13:27 -0800)]
vold: suppress unused argument warning messages
Change-Id: Ic1ab533f756fbd44b1f2e5ae12e2f5736ace7740
Stephen Smalley [Wed, 12 Feb 2014 14:43:08 +0000 (09:43 -0500)]
Convert all selinux_android_restorecon and _setfilecon calls to new API.
libselinux selinux_android_restorecon API is changing to the more
general interface with flags and dropping the older variants.
Also get rid of the old, no longer used selinux_android_setfilecon API
and rename selinux_android_setfilecon2 to it as it is the only API in use.
Change-Id: I1e71ec398ccdc24cac4ec76f1b858d0f680f4925
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
OSDN Git Service
