Commit graph

261 commits

Author SHA1 Message Date
Ken Sumrall
319369ac11 Fix a typo in cryptfs.c
Change-Id: If629fa996b135e432bc89da7518b0c1f02750b45
2012-06-27 16:30:18 -07:00
Ken Sumrall
af05ec0e5e am e5032c42: Changes to encryption to work with the new filesystem manager
* commit 'e5032c42da3c33a854df0a24a7968b4ab54190b9':
  Changes to encryption to work with the new filesystem manager
2012-05-01 14:04:56 -07:00
Ken Sumrall
e5032c42da Changes to encryption to work with the new filesystem manager
The new filesystem manager is in charge of mounting the block devices now,
removing much of the knowledge from init.<device>.rc.  This also let us
clean up some init code dealing with encryption, so this change updates
vold to work with that.  More cleanup is possible, but the main goal of the
filesystem manager was to enable e2fsck, not a full cleanup of encryption.

Change-Id: I00ea80a923d14770ed8fdd190e8840be195f8514
2012-05-01 13:14:55 -07:00
Ken Sumrall
f0679f0da4 Changes to encryption to work with the new filesystem manager
The new filesystem manager is in charge of mounting the block devices now,
removing much of the knowledge from init.<device>.rc.  This also let us
clean up some init code dealing with encryption, so this change updates
vold to work with that.  More cleanup is possible, but the main goal of the
filesystem manager was to enable e2fsck, not a full cleanup of encryption.

Change-Id: I00ea80a923d14770ed8fdd190e8840be195f8514
2012-04-27 16:44:22 -07:00
Kenny Root
7b0bc85714 Fix truncation of ASEC ids
Change-Id: I1e6bfcc6b0a5be47e6fd19922fc81669f61b5dba
2012-04-27 15:33:58 -07:00
Kenny Root
344ca10856 Add in ext4 support for ASEC containers
Now forward locked applications will be in ASEC containers both internal
to the system and externally.

This change adds support for putting applications in ext4-based ASECs.

Change-Id: I8d6765b72dd2606e429c067b47a2dbcaa8bef37d
2012-04-25 14:15:15 -07:00
Mike Lockwood
8cd47b4c3b Merge remote-tracking branch 'goog/ics-aah-exp' 2012-03-21 15:45:48 -07:00
Mike Lockwood
781bbab8dd Merge commit '43b80c229bdee7f32654e2ec561078c5c94c8851'
empty merge with -s ours

Change-Id: I4c7d6fb13e175af819cab784704e08e9189f6739
2012-03-21 15:45:26 -07:00
Ken Sumrall
b018fe74c2 Merge "Fix vdc to add sequence number for NativeConectorDaemon" 2012-03-09 17:02:58 -08:00
Ken Sumrall
d02a47239c Merge "Fix to not return a bogus decryption error when a device is not encrypted." 2012-03-09 17:02:44 -08:00
Ken Sumrall
d4b3661cae Fix vdc to add sequence number for NativeConectorDaemon
NativeConnectorDaemon was changed to use an optional sequence number,
and most services were changed to require it.  Now that vold requires
a sequence number, vdc must provide one.

Change-Id: Ibdff9878faf19eae25525221c80bcb5e5f87cfea
2012-03-09 16:48:48 -08:00
Glenn Kasten
c7ad326381 Merge "Use sched_policy to avoid hard-coded cpuctl path" 2012-03-07 07:15:48 -08:00
Glenn Kasten
1b4807b19a Use sched_policy to avoid hard-coded cpuctl path
Change-Id: I8f62287d1b60d8eef72d1dfc64be5c3d56e9f498
2012-03-05 15:14:33 -08:00
Robert Greenwalt
149aa3eb65 Use the new command numbering scheme.
Support multiple commands on a single socket via command numbers.
NativeDaemonConnector has been changed, so we need to use it here
too.

bug:5864209
Change-Id: Ie06e966d50057d122a958377731c0385ea367b69
2012-02-29 16:51:44 -08:00
Nick Kralevich
9713ed4639 vold: add -Werror=format
Stop format string bugs from creeping into root level processes.

Change-Id: Ifa19ac0cacba76392040ab16cebe557b5b016706
2012-02-23 13:20:30 -08:00
Mike Lockwood
ee6d8c42f3 Add support for wiping data immediately if crypt fails
Needed for headless devices that need to recover with no user intervention

Bug: 5556856

Change-Id: I0f85591df513a6893324fb057bde114ac1df044b
Signed-off-by: Mike Lockwood <lockwood@google.com>
2012-02-16 09:39:27 -08:00
Mike Lockwood
a6251c6f91 Add support for wiping data immediately if crypt fails
Needed for headless devices that need to recover with no user intervention

Bug: 5556856

Change-Id: Iabe5d68599259b14626bfcf45e6697d81b866101
Signed-off-by: Mike Lockwood <lockwood@google.com>
2012-02-15 13:43:28 -08:00
Ken Sumrall
e1a4585784 Fix to not return a bogus decryption error when a device is not encrypted.
If there is filesystem damage on a non-encrypted device, and /data is not
mountable, and if the device stores the keys in a file on a different
partition (like on Crespo) then, vold would return an error which caused
the crypto UI to present an option to the user to wipe the device because
it assumed encryption had failed.  This fixes it to not do that.

Change-Id: Ibff6299787b45768416dbc4052de7db3b140b808
2011-12-14 22:33:45 -08:00
Ed Heyl
43b80c229b keep previous history after reset to mr1 plus aah changes (ics-aah-wip) 2011-10-28 19:06:01 +00:00
Ed Heyl
fab5f878ac undo reset to ics-mr1 until we have a better method 2011-10-26 21:53:28 +00:00
Ed Heyl
e029169812 reset to ics-mr1, but keep history 2011-10-26 18:50:28 +00:00
Steve Block
71189e7f31 am 8c487331: (-s ours) Rename LOG() to ALOG() DO NOT MERGE
* commit '8c4873319a77c54cc198a4e5f4429099ff9da4f7':
  Rename LOG() to ALOG()  DO NOT MERGE
2011-10-25 10:59:51 -07:00
Steve Block
8c4873319a Rename LOG() to ALOG() DO NOT MERGE
See https://android-git.corp.google.com/g/#/c/141576

Bug: 5449033
Change-Id: Icc1c76abe506d53c07c7c3db526c6fa05f73988b
2011-10-25 10:52:23 +01:00
Ken Sumrall
3ad9072a5d Add the new verifypw command to vold/cryptfs
This vold command returns 0 if the given password matches the password
used to decrypt the device on boot.  It returns 1 if they don't match,
and it returns -1 on an internal error, and -2 if the device is not encrypted.

Also check the uid of the sender of the command and only allow the root and
system users to issue cryptfs commands.

Change-Id: I5e5ae3b72a2d7814ae68c2d49aa9deb90fb1dac5
2011-10-12 19:10:38 -07:00
Ken Sumrall
3be890f59c Fix cryptfs to work with a raw block device for key storage
If a raw block is specified for key storage, do not try to force the size
of the file to 16 Kbytes when writing the keys, and do not complain if
the size is not 16 Kbytes when reading the keys.  Only do them if the
keyfile is a regular file.

Change-Id: I4de1cb7c3614479d93289d4f2767ca6ce1bbbc73
2011-09-14 16:53:46 -07:00
Ken Sumrall
0b8b597193 Add the ability to revert a crypto mapping when unmounting a volume
Add the force_and_revert option to the unmount command which will force
the unmount, and revert a crypto mapping.  This is used during factory
reset so that when the internal sdcard volume is formatted, it formats
the raw device, not the encrypted mapping.

Change-Id: I36b6ff9bb54863b121de635472a303bf4a2334a9
2011-08-31 18:09:35 -07:00
The Android Open Source Project
e14fcf99b5 Reconcile with gingerbread-release
Change-Id: Ia9383258bc25f7a82628a1c7238140b810e2f3d3
2011-07-18 08:10:23 -07:00
David 'Digit' Turner
5bf00e62a2 am 6c190fd3: am 137858b4: resolved conflicts for merge of 5284bcff to gingerbread-plus-aosp
* commit '6c190fd326099d8315e194b0ad0a173e21146e14':
  Avoid array overrun. We can now mount the /sdcard partition on our boot sdcards
2011-07-14 10:56:08 -07:00
David 'Digit' Turner
6c190fd326 am 137858b4: resolved conflicts for merge of 5284bcff to gingerbread-plus-aosp
* commit '137858b43b7e0ed46fb8ebce9230eb40f0a62432':
  Avoid array overrun. We can now mount the /sdcard partition on our boot sdcards
2011-07-14 09:18:29 -07:00
David 'Digit' Turner
137858b43b resolved conflicts for merge of 5284bcff to gingerbread-plus-aosp
Change-Id: I108a0c32efb5add1fec41bfe76f041971801d48d
2011-07-14 07:35:14 +02:00
Jeff Brown
81893259c9 Merge "Remove the simulator target from all makefiles. Bug: 5010576" 2011-07-12 12:17:00 -07:00
Jeff Brown
ea89f53387 Remove the simulator target from all makefiles.
Bug: 5010576

Change-Id: I7e531101ae057fb059d7d56c99433c4d66e866dc
2011-07-11 22:12:37 -07:00
Ken Sumrall
6f0b430815 Merge "Prevent sharing or formatting of a vold managed volumes during encryption." 2011-07-11 15:51:09 -07:00
Ken Sumrall
3b17005083 Prevent sharing or formatting of a vold managed volumes during encryption.
Mounting was already not allowed, but also unshare before starting
encryption, and don't allow sharing or formatting to be initiated
during encrytion.

Change-Id: Ida188d81f025739ba4dd90492b3e66088735991e
2011-07-11 15:38:57 -07:00
Ken Sumrall
396844d17a Merge "Fix to display the proper percentage complete during encryption." 2011-07-11 15:37:05 -07:00
Ken Sumrall
128626fc5a Fix to display the proper percentage complete during encryption.
Forgot to include the size of the userdata partition when computing
the total size of vold managed volumes to encrypt.

Change-Id: I237548439d4380b4225ffbc603fa972c3b1c5bae
2011-07-11 15:33:05 -07:00
android-merger
a0272d2c18 reset, and keep history 2011-07-08 12:29:24 -07:00
David 'Digit' Turner
5284bcffed merge intel x86 patches into gingerbread branch 2011-07-08 18:19:06 +02:00
The Android Open Source Project
5283052272 Reconcile with gingerbread-release
Change-Id: I3cb3d915837ebe59c2d7007d71ef3a1f334e9b8b
2011-07-07 15:22:42 -07:00
android-merger
1c55ddb758 Revert "add bounds checking for mPartMinors[]"
This reverts commit f3d3ce5e53.
2011-07-07 14:54:24 -07:00
android-merger
cf7369a458 Revert "vold: Enable the SO_PASSCRED socket option"
This reverts commit c51920c824.
2011-07-07 14:54:01 -07:00
Joseph Lehrer
507d31b86b vold: retry mounting partition
Works around a race condition between the vold and MountService uevent handlers

Change-Id: I71c92f2e9b92e1fefc192da166a91d81bc60e242
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-07-06 13:29:32 -04:00
Mike Lockwood
9322b103a3 am 273d3549: am 2c9d8de7: Merge "Prevent buffer overflows."
* commit '273d3549198d144331f3e502eeb1215417d72b16':
  Prevent buffer overflows.
2011-06-29 06:46:53 -07:00
Mike Lockwood
273d354919 am 2c9d8de7: Merge "Prevent buffer overflows."
* commit '2c9d8de79a0dd7f894c65777a197c86486aff96c':
  Prevent buffer overflows.
2011-06-29 06:42:33 -07:00
Mike Lockwood
2c9d8de79a Merge "Prevent buffer overflows." 2011-06-29 06:30:38 -07:00
Dianne Hackborn
736910ca99 Add new vold call to get the path to an asec fs.
Change-Id: Ife15628ed6e2493c9e85a2ade6d59a194fdddde5
2011-06-27 13:37:28 -07:00
Peter Bohm
092aa1c585 Prevent buffer overflows.
To eliminate possible buffer overflows some strcpy,
sprintf and strcat have been changed to strlcpy,
snprintf and strlcat.

Change-Id: Ieb9d4b600c894946a6492f8629ff39f2fcc106d3
Signed-off-by: Oskar Andero <oskar.andero@sonyericsson.com>
2011-06-27 10:04:05 +02:00
Mike Lockwood
97f2fc110b Update path for seting USB mass storage backing store
Change-Id: I0e5fab1624e5ef5d2f55e2584d8adc1b6bab91b0
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-06-17 23:57:12 -04:00
Mike Lockwood
6b715592ec Merge "Remove obsolete code for monitoring USB status" 2011-06-17 20:55:07 -07:00
Ken Sumrall
86bccb14d6 Merge "Don't abort the encryption process if an internal volume is present but unmounted." 2011-06-14 15:30:36 -07:00