Mark Salyzyn
3e971277db
vold: suppress unused argument warning messages
...
Change-Id: Ic1ab533f756fbd44b1f2e5ae12e2f5736ace7740
11 years ago
Nick Kralevich
4ff7225154
am ca3593df: am 311edc8c: Merge "Add SELinux restorecon calls on ASEC containers."
...
* commit 'ca3593df3d48cb4b51acf89e6df4872b922fd51d':
Add SELinux restorecon calls on ASEC containers.
11 years ago
Nick Kralevich
ca3593df3d
am 311edc8c: Merge "Add SELinux restorecon calls on ASEC containers."
...
* commit '311edc8cb2dd5c86bad49f9696333874b400f9c4':
Add SELinux restorecon calls on ASEC containers.
11 years ago
Nick Kralevich
311edc8cb2
Merge "Add SELinux restorecon calls on ASEC containers."
11 years ago
Colin Cross
88948cd60c
am e985c9ab: am 1d8e3ce8: Merge "vold: fix errors inside ALOGV"
...
* commit 'e985c9ab10fed452b97138170b4d69288d076b06':
vold: fix errors inside ALOGV
11 years ago
Colin Cross
e985c9ab10
am 1d8e3ce8: Merge "vold: fix errors inside ALOGV"
...
* commit '1d8e3ce8da962e5ff98d36e75f6b02873fdddb70':
vold: fix errors inside ALOGV
11 years ago
Colin Cross
1d8e3ce8da
Merge "vold: fix errors inside ALOGV"
11 years ago
Colin Cross
59846b654e
vold: fix errors inside ALOGV
...
Fix errors exposed by adding compile-time checking to disabled ALOGVs.
Change-Id: I29bd6e9a7648ccca02e0e9a96b79ee0ea7b5cfc6
11 years ago
Robert Craig
b9e3ba56cb
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.
Change-Id: Iefee74214d664acd262edecbb4f981d633ff96ce
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
11 years ago
Paul Lawrence
c938df25c8
Merge "Fast ext4 encryption"
11 years ago
Paul Lawrence
ae59fe6c19
Fast ext4 encryption
...
For ext4 filesystems, only encrypt blocks in use.
Needs matching ext4 utils changes from
https://googleplex-android-review.git.corp.google.com/#/c/409575
Bug: 11985952
Change-Id: I89df051c25105daf3f469cc980195202f8be6786
11 years ago
Nick Kralevich
ba3b0e8add
am e8e1d80c: am 4d5d99ce: am 7cf05b15: am 2f0a1d66: am 7f6932df: am 35ab6119: am 3e03bf8a: am fd2dcf90: am f4770dcf: am 0de7c611: Validate asec names.
...
* commit 'e8e1d80c64db85526a003e88c3dba36ff33dac74':
Validate asec names.
11 years ago
Nick Kralevich
e8e1d80c64
am 4d5d99ce: am 7cf05b15: am 2f0a1d66: am 7f6932df: am 35ab6119: am 3e03bf8a: am fd2dcf90: am f4770dcf: am 0de7c611: Validate asec names.
...
* commit '4d5d99ce39b5edd0b78c47a93563aed6b3d56356':
Validate asec names.
11 years ago
Nick Kralevich
4d5d99ce39
am 7cf05b15: am 2f0a1d66: am 7f6932df: am 35ab6119: am 3e03bf8a: am fd2dcf90: am f4770dcf: am 0de7c611: Validate asec names.
...
* commit '7cf05b15b76b91aa07182e86a730d7552b23130c':
Validate asec names.
11 years ago
Nick Kralevich
7cf05b15b7
am 2f0a1d66: am 7f6932df: am 35ab6119: am 3e03bf8a: am fd2dcf90: am f4770dcf: am 0de7c611: Validate asec names.
...
* commit '2f0a1d66585fb44f59d913d3417422486ef10225':
Validate asec names.
11 years ago
Nick Kralevich
2f0a1d6658
am 7f6932df: am 35ab6119: am 3e03bf8a: am fd2dcf90: am f4770dcf: am 0de7c611: Validate asec names.
...
* commit '7f6932df89756f796c3a1f04f748db39a0564561':
Validate asec names.
11 years ago
Nick Kralevich
7f6932df89
am 35ab6119: am 3e03bf8a: am fd2dcf90: am f4770dcf: am 0de7c611: Validate asec names.
...
* commit '35ab611925aea29fc4088b5c3de7c8c77d956b8b':
Validate asec names.
11 years ago
Nick Kralevich
35ab611925
am 3e03bf8a: am fd2dcf90: am f4770dcf: am 0de7c611: Validate asec names.
...
* commit '3e03bf8a7ab9dcee8897f275c75adfcdb20e0fdc':
Validate asec names.
11 years ago
Nick Kralevich
3e03bf8a7a
am fd2dcf90: am f4770dcf: am 0de7c611: Validate asec names.
...
* commit 'fd2dcf905abd3dc76738fd864e3979bd6e5ce183':
Validate asec names.
11 years ago
Nick Kralevich
fd2dcf905a
am f4770dcf: am 0de7c611: Validate asec names.
...
* commit 'f4770dcf6ffe2baba16cbb290aba16f735c51962':
Validate asec names.
11 years ago
Nick Kralevich
f4770dcf6f
am 0de7c611: Validate asec names.
...
* commit '0de7c61102611ccd5df1ca48cb733bf037512c6b':
Validate asec names.
11 years ago
Nick Kralevich
0de7c61102
Validate asec names.
...
Make sure asec names only contain alphanumeric, underscores,
dots, or dashes. Don't allow double dots.
Bug: 12504045
(cherry picked from commit 6696260965
)
Change-Id: Ia9d04f373aa95878b2e81584c4167dc2d4aa0c78
11 years ago
Nick Kralevich
6696260965
Validate asec names.
...
Make sure asec names only contain alphanumeric, underscores,
dots, or dashes. Don't allow double dots.
Bug: 12504045
Change-Id: I3dd0350c79327dc91a5a10d5724d85d99814e769
11 years ago
Colin Cross
01012342f4
am 353b45f8: Merge "vold: fix warnings for 64-bit"
...
* commit '353b45f84fa0bde76c91d338f843ff27c6f646ad':
vold: fix warnings for 64-bit
11 years ago
Colin Cross
353b45f84f
Merge "vold: fix warnings for 64-bit"
11 years ago
Colin Cross
346c5b20cb
vold: fix warnings for 64-bit
...
Replace MINOR(dev_t) and MAJOR(dev_t) with minor and major,
which cast to int.
Cast int to uintptr_t before casting to pointer
Change-Id: I59375518f15d27f400fcd4f8a8dfe5ebdd8350e6
11 years ago
Colin Cross
699bfa411e
am 8328e815: Merge "vold: remove from include path"
...
* commit '8328e8150f4e7b785785754f2d44794e7bab3577':
vold: remove $(KERNEL_HEADERS) from include path
11 years ago
Colin Cross
8328e8150f
Merge "vold: remove $(KERNEL_HEADERS) from include path"
11 years ago
Colin Cross
23b571bb57
vold: remove $(KERNEL_HEADERS) from include path
...
The kernel headers are already in the include path, and manually
adding them again will break on a multiarch build, where the
kernel headers may be different for each arch.
Change-Id: Ifb11fa7bdff6b317c44258968244313b7039a9e1
11 years ago
Doug Zongker
6fd5771337
allow encrypted filesystems to be mounted readonly
...
By setting ro.crypto.readonly to 1, cryptfs will mount an encrypted
filesystem that is normally mounted read-write as read-only instead.
To be used when recovery mounts /data.
Bug: 12188746
Change-Id: If3f3f9a3024f29ebc4ad721a48546a332cb92b6b
11 years ago
JP Abgrall
dbf5b6652c
am 46f8c2b9: am 7bdfa52d: vold: cryptfs: Don\'t update KDF without validating pwd/key.
...
* commit '46f8c2b954e11c2266871b8110b74bd6a11f3661':
vold: cryptfs: Don't update KDF without validating pwd/key.
11 years ago
JP Abgrall
46f8c2b954
am 7bdfa52d: vold: cryptfs: Don\'t update KDF without validating pwd/key.
...
* commit '7bdfa52d934465e2182e2f1c200c4d8581ad5da6':
vold: cryptfs: Don't update KDF without validating pwd/key.
11 years ago
JP Abgrall
7bdfa52d93
vold: cryptfs: Don't update KDF without validating pwd/key.
...
Prior to this, the Key derivation function would get
blindly updated even if the user entered the wrong password.
Now, we only attempt to upgrade the KDF if the pwd/key have
been verified (i.e. after a successful mount).
Bug: 11460197
Change-Id: I0469228cc9b87c47754e8ca3c7146651da177da5
11 years ago
Jeff Sharkey
74a8ca7ec2
am 86697c72: am 6bcd362e: Handle missing UUID/LABEL from blkid.
...
* commit '86697c72ae29661ad64cfd7b134fa3d3215e0cc3':
Handle missing UUID/LABEL from blkid.
11 years ago
Jeff Sharkey
86697c72ae
am 6bcd362e: Handle missing UUID/LABEL from blkid.
...
* commit '6bcd362edd1f0ad97807276ff7f9f16991df99a4':
Handle missing UUID/LABEL from blkid.
11 years ago
Jeff Sharkey
6bcd362edd
Handle missing UUID/LABEL from blkid.
...
Bug: 11627785
Change-Id: Iee757abbc3795234f41d513a6aed8ad33855cb7a
11 years ago
JP Abgrall
502dc74153
vold: cryptfs: Retry encryption after killing processes using /data
...
Currently, if a non-framework process or service is using /data,
unmounting will fail as nothing will kill it.
Instead of rebooting on unmount failure, we now kill all processes
using /data, then try one more time.
Bug: 11291208
Change-Id: I6c5276c78aa55965914ace96e1db74dc80fca3c1
11 years ago
Blair Prescott
0291262a68
am 3aefb598: am cc21d6ea: Use correct minor device number to format SD card
...
* commit '3aefb598e4811acc5a198cc9ba20025d95803353':
Use correct minor device number to format SD card
11 years ago
Blair Prescott
3aefb598e4
am cc21d6ea: Use correct minor device number to format SD card
...
* commit 'cc21d6ea5881a9f576296317bde8d818b3e4fc01':
Use correct minor device number to format SD card
11 years ago
Blair Prescott
cc21d6ea58
Use correct minor device number to format SD card
...
When formatting SD card partitions, instead of assuming partition
minor device numbers start from 1, use (minor device number of
the disk device + 1) as the starting point.
Bug: 11352632
Change-Id: I69d37f57aec6b62fe2a055470f7525ec09dc3859
Signed-off-by: Blair Prescott <blairp@broadcom.com>
Signed-off-by: Pierre <pierre@broadcom.com>
11 years ago
Jeff Sharkey
18caf5b717
am 32e20905: am bcdbd9ac: Merge "Clean up ASEC unmounting on physical storage." into klp-dev
...
* commit '32e2090562552041a15e73afcce1e9948d9eb634':
Clean up ASEC unmounting on physical storage.
11 years ago
Jeff Sharkey
0368cd4355
am f4a8c0b9: am 10939ac7: Merge "Extract UUID and label from inserted volumes." into klp-dev
...
* commit 'f4a8c0b9f646cd9fa51fe3746bc8a00bb987124b':
Extract UUID and label from inserted volumes.
11 years ago
Jeff Sharkey
32e2090562
am bcdbd9ac: Merge "Clean up ASEC unmounting on physical storage." into klp-dev
...
* commit 'bcdbd9ac0657a27ff9f7772e74c45ec1e2d460c7':
Clean up ASEC unmounting on physical storage.
11 years ago
Jeff Sharkey
f4a8c0b9f6
am 10939ac7: Merge "Extract UUID and label from inserted volumes." into klp-dev
...
* commit '10939ac7e8c9fd141f45f1d6d82c78d5f5f5319c':
Extract UUID and label from inserted volumes.
11 years ago
Jeff Sharkey
bcdbd9ac06
Merge "Clean up ASEC unmounting on physical storage." into klp-dev
11 years ago
Jeff Sharkey
10939ac7e8
Merge "Extract UUID and label from inserted volumes." into klp-dev
11 years ago
Jeff Sharkey
8c2c15b1c6
Clean up ASEC unmounting on physical storage.
...
When physical devices are unsafely removed, unmountAllAsecsInDir()
fails to find any ASECs, and leaves them all mounted, preventing the
rest of volume from going down.
Now we examine all ASEC containers, and remove when on external
storage, or when the storage media is no longer found.
Bug: 11175082
Change-Id: Iffa38ea43f7e5ad78b598374ebeb60a8727d99fd
11 years ago
Jeff Sharkey
0de365fc0a
Extract UUID and label from inserted volumes.
...
Uses "blkid" tool to extract metadata from an inserted volume, and
reports it up to the framework. This needs to happen in vold, since
only the FUSE-wrapped volume is visible to userspace.
Remove autorun sanitization, since FUSE takes care of this now.
Bug: 11175082
Change-Id: Ie69b38011ad6011bfb50e40d4f35a29e02150c19
11 years ago
Jeff Sharkey
fd0eec49b7
am ece855c2: (-s ours) am 18afaca1: Merge "DO NOT MERGE. Fix crash in vold" into klp-dev
...
* commit 'ece855c21d5f21603edf7a67c56181502857b1df':
DO NOT MERGE. Fix crash in vold
11 years ago
Jeff Sharkey
ece855c21d
am 18afaca1: Merge "DO NOT MERGE. Fix crash in vold" into klp-dev
...
* commit '18afaca1ad6f480ab6ac259278c8c8013aaab45a':
DO NOT MERGE. Fix crash in vold
11 years ago