OSDN Git Service
Tom Cherry [Fri, 31 Mar 2017 16:47:44 +0000 (16:47 +0000)]
Merge "vdc: use libbase logging and log directly to kmsg on boot" am:
4f6c1ee19f am:
e3a8a60024
am:
83f1551ecb
Change-Id: Ib6c575bbfd010e71cac509bee343a7be563e730a
Tom Cherry [Fri, 31 Mar 2017 16:45:11 +0000 (16:45 +0000)]
Merge "vdc: use libbase logging and log directly to kmsg on boot" am:
4f6c1ee19f
am:
e3a8a60024
Change-Id: Ifae6798ca5d352c05cd78dce59087bf3a29eede8
Tom Cherry [Fri, 31 Mar 2017 16:43:12 +0000 (16:43 +0000)]
Merge "vdc: use libbase logging and log directly to kmsg on boot"
am:
4f6c1ee19f
Change-Id: Ib5c11abb027f5c91f448e0322a11ed93c4ce29e2
Tom Cherry [Fri, 31 Mar 2017 16:41:00 +0000 (16:41 +0000)]
Merge "vdc: use libbase logging and log directly to kmsg on boot"
Tom Cherry [Wed, 29 Mar 2017 23:50:28 +0000 (16:50 -0700)]
vdc: use libbase logging and log directly to kmsg on boot
Init is no longer calling vdc with logwrapper, so it must take care of
logging to kmsg directly.
Test: observe logging in kmsg on boot and stderr on normal usage
Change-Id: Ie3e59da433bd154f121ce103dea0c59eb0bab069
Jeff Sharkey [Mon, 27 Mar 2017 16:49:21 +0000 (10:49 -0600)]
Spread around some O_CLOEXEC love.
Also remove some unnecessary SELinux logic when creating image files
for loop devices.
Test: builds, boots, common operations work
Bug:
34903607
Change-Id: I68dfa022ecc39f56c175e786694e0de35b954ca0
Jeff Sharkey [Mon, 27 Mar 2017 15:22:47 +0000 (15:22 +0000)]
Merge "Add a new "virtual disk" feature."
Jeff Sharkey [Sun, 26 Mar 2017 04:49:13 +0000 (22:49 -0600)]
Add a new "virtual disk" feature.
It's extremely difficult to test storage related logic on devices
that don't have physical SD card slots. So to support better
debugging and testing, add a new "virtual disk" feature which mounts
a 512MB file through loop device.
It relies on the kernel having the "loop.max_part" value set to
something other than 0 via the boot command line, since that allows
all the existing partition logic to fall into place.
Bug:
34903607
Test: builds, boots, virtual disk works
Change-Id: I04c5b33e37319d867542985a56b7999a9b7cf35d
Shawn Willden [Wed, 1 Mar 2017 13:44:15 +0000 (06:44 -0700)]
Add digest support and implementation name to getHardwareFeatures.
Test: Manual
Change-Id: I910dea4fab671436fe5eb2ab35a6ffaa86179b35
Keun-young Park [Wed, 15 Mar 2017 02:56:40 +0000 (02:56 +0000)]
Merge "make shutdown safe for double calls." am:
71fa1068de am:
2f93c657f4
am:
2a8605b9d1
Change-Id: Id1cd83d307e7791359bc6dfd96368f1138ff21d2
Keun-young Park [Wed, 15 Mar 2017 02:52:10 +0000 (02:52 +0000)]
Merge "make shutdown safe for double calls." am:
71fa1068de
am:
2f93c657f4
Change-Id: I78962b7272ef0c39a133db042f36684fc1324018
Keun-young Park [Wed, 15 Mar 2017 02:47:09 +0000 (02:47 +0000)]
Merge "make shutdown safe for double calls."
am:
71fa1068de
Change-Id: I161c96dc5a44890fffe8fcdf9e0f8fc874df29c0
Treehugger Robot [Wed, 15 Mar 2017 02:39:50 +0000 (02:39 +0000)]
Merge "make shutdown safe for double calls."
Keun-young Park [Tue, 14 Mar 2017 01:02:50 +0000 (18:02 -0700)]
make shutdown safe for double calls.
- In new shutdown sequence, volume shutdown is requested in two places:
system_server and init.
- Make VolumeManager.shutdown safe for double calls.
It crashed before this change.
bug:
36004738
Test: reboot and check last_kmsg for crash / vdc timeout
Change-Id: I296913959b2647b65d66553073f2032545beba57
Bowgo Tsai [Fri, 10 Mar 2017 03:17:52 +0000 (03:17 +0000)]
Merge "vold: replacing fs_mgr_read_fstab() with fs_mgr_read_fstab_default()" am:
92f21f5294 am:
f53cc1b04a
am:
b169603d95
Change-Id: Ic3ac2ccb853b43d9051d3703f19590cf97b3e689
Bowgo Tsai [Fri, 10 Mar 2017 02:15:05 +0000 (02:15 +0000)]
Merge "vold: replacing fs_mgr_read_fstab() with fs_mgr_read_fstab_default()" am:
92f21f5294
am:
f53cc1b04a
Change-Id: I05095049ec6f478c3b9b31bccd6c828cf52b7d7c
Bowgo Tsai [Fri, 10 Mar 2017 02:12:40 +0000 (02:12 +0000)]
Merge "vold: replacing fs_mgr_read_fstab() with fs_mgr_read_fstab_default()"
am:
92f21f5294
Change-Id: I830cc6be023737b9befc112fdf9b010996314ec9
Treehugger Robot [Fri, 10 Mar 2017 02:07:34 +0000 (02:07 +0000)]
Merge "vold: replacing fs_mgr_read_fstab() with fs_mgr_read_fstab_default()"
Bowgo Tsai [Thu, 9 Mar 2017 15:11:33 +0000 (23:11 +0800)]
vold: replacing fs_mgr_read_fstab() with fs_mgr_read_fstab_default()
The original default /fstab.{ro.hardware} might be moved to /vendor/etc/.
or /odm/etc/. Use the new API to get the default fstab instead of using
the hard-coded /fstab.{ro.hardware}.
Bug:
35811655
Test: boot marlin with /vendor/etc/fstab.marlin
Change-Id: I92d6aefe6ff3433b7d1a671358d990bb7b1f2150
Janis Danisevskis [Wed, 8 Mar 2017 19:02:30 +0000 (11:02 -0800)]
Fix missing error handling in keymaster comatibility check
The compatibility check assumes that the keymaster session was created
successfully which is a faulty assumption.
This patch adds propper error handling to the check.
Bug:
35576166
Change-Id: I0c70a0e53f488f8bd3164898722f490cd0573ce3
Wei Wang [Tue, 7 Mar 2017 20:30:10 +0000 (20:30 +0000)]
Merge "vold: add coldboot back and make sure it won't block booting" am:
b3715cf3af am:
5457b47f9e
am:
660006e7a4
Change-Id: I21e4ba746c99bd8c372d802f11f0bb3f36376553
Wei Wang [Tue, 7 Mar 2017 20:29:11 +0000 (20:29 +0000)]
Merge "vold: add coldboot back and make sure it won't block booting" am:
b3715cf3af
am:
5457b47f9e
Change-Id: If63bbecc52fec415b38b86ddc32706a3742fcad3
Wei Wang [Tue, 7 Mar 2017 20:25:40 +0000 (20:25 +0000)]
Merge "vold: add coldboot back and make sure it won't block booting"
am:
b3715cf3af
Change-Id: I725dc07d0bd3afa73081affb56a24e6a216ec9d2
Treehugger Robot [Tue, 7 Mar 2017 20:24:00 +0000 (20:24 +0000)]
Merge "vold: add coldboot back and make sure it won't block booting"
Calin Juravle [Tue, 7 Mar 2017 19:10:47 +0000 (19:10 +0000)]
Merge "Vold: Clean up code related to foreign dex use" am:
61a7d1a815 am:
aaa95fbdfe
am:
0a8d4511c8
Change-Id: I3a84eca8a285bed3ec42c8744db8974e0109fb65
Calin Juravle [Tue, 7 Mar 2017 19:08:15 +0000 (19:08 +0000)]
Merge "Vold: Clean up code related to foreign dex use" am:
61a7d1a815
am:
aaa95fbdfe
Change-Id: I71276a5d18d6c81c97b6c31086a7d9eef47fece4
Calin Juravle [Tue, 7 Mar 2017 19:06:15 +0000 (19:06 +0000)]
Merge "Vold: Clean up code related to foreign dex use"
am:
61a7d1a815
Change-Id: I296f71434198c41c9ba340891efaf472e3d69dd6
Calin Juravle [Tue, 7 Mar 2017 19:00:18 +0000 (19:00 +0000)]
Merge "Vold: Clean up code related to foreign dex use"
Wei Wang [Tue, 7 Mar 2017 01:27:05 +0000 (17:27 -0800)]
vold: add coldboot back and make sure it won't block booting
coldboot is needed when device rebooted with USB device attched
so Vold netlink won't miss the information.
This CL added back coldboot and moved down so that it won't block
vold cl and ccl threads.
Bug:
36007238
Test: reboot marlin with flash drive attached and flash drive is recognized
Change-Id: Ie39f348e97a8500515e394e386541289a91b2425
Calin Juravle [Sat, 4 Mar 2017 01:51:35 +0000 (17:51 -0800)]
Vold: Clean up code related to foreign dex use
We simplified the way we track whether or not a dex file is used by
other apps. DexManger in the framework keeps track of the data and we
no longer need file markers on disk.
Test: device boots, foreign dex markers are not created anymore
Bug:
32871170
Change-Id: Id0360205b019be92049f36eab4339f4736e974f4
TreeHugger Robot [Sat, 25 Feb 2017 08:17:59 +0000 (08:17 +0000)]
Merge "Change to use new WaitForProperty API"
Wei Wang [Sat, 25 Feb 2017 01:43:01 +0000 (17:43 -0800)]
Change to use new WaitForProperty API
Change to use WaitForProperty API to wait for vold.post_fs_data_done
Also change cryptfs to C++
Bug:
35425974
Test: mma, marlin/angler boot
Change-Id: Id821f2035788fcc91909f296c83c871c67571de3
Chris Phoenix [Wed, 25 Jan 2017 23:15:46 +0000 (15:15 -0800)]
keymaster HAL uses "default" service name
The getService() and registerAsService() methods of interface objects
now have default parameters of "default" for the service name. HALs
will not have to use any service name unless they want to register
more than one service.
Test: marlin boots
Bug:
33844934
Change-Id: I7c68c8b9ab0101b2f10ca20b9971a5bd34377168
Rubin Xu [Wed, 15 Feb 2017 22:37:39 +0000 (22:37 +0000)]
Merge "Support keys with a secret but no token, which are handled not using Keymaster but in-process crypto."
Isaac Chen [Wed, 15 Feb 2017 09:00:36 +0000 (09:00 +0000)]
Merge "Removed HW encryption build flags and related code." am:
bf8518056d am:
95dc636942 am:
730c6196a2
am:
2f88e97172
Change-Id: I2decffa399cbc941b93ba251957f2a9168945d29
Isaac Chen [Wed, 15 Feb 2017 08:57:14 +0000 (08:57 +0000)]
Merge "Removed HW encryption build flags and related code." am:
bf8518056d am:
95dc636942
am:
730c6196a2
Change-Id: I3a24fffb05b8376f60d085f73354266cb4b4295d
Isaac Chen [Wed, 15 Feb 2017 08:54:13 +0000 (08:54 +0000)]
Merge "Removed HW encryption build flags and related code." am:
bf8518056d
am:
95dc636942
Change-Id: Id8db71142589232ec4342bb025761e645fd8dac2
Isaac Chen [Wed, 15 Feb 2017 08:51:13 +0000 (08:51 +0000)]
Merge "Removed HW encryption build flags and related code."
am:
bf8518056d
Change-Id: I969e9062b6c4d1827614d8272539489d26320f0d
Isaac Chen [Wed, 15 Feb 2017 08:45:29 +0000 (08:45 +0000)]
Merge "Removed HW encryption build flags and related code."
TreeHugger Robot [Wed, 15 Feb 2017 00:09:02 +0000 (00:09 +0000)]
Merge "Port cryptfs to HILD keymaster HAL"
Isaac Chen [Tue, 14 Feb 2017 12:40:00 +0000 (20:40 +0800)]
Removed HW encryption build flags and related code.
TARGET_HW_DISK_ENCRYPTION and TARGET_CRYPTFS_HW_PATH build flags
and related code in cryptfs.c are removed since it doesn't match
the driver in current tree.
To enable HW encryption, the driver needs to be hidlized.
Bug:
34268168
Test: compile
Change-Id: I507a0e2908b3c407c565e44873b82c94a8305de6
Janis Danisevskis [Tue, 31 Jan 2017 11:31:08 +0000 (11:31 +0000)]
Port cryptfs to HILD keymaster HAL
Cryptfs uses keymaster for key derivation. Vold has a C++ abstraction
for Keymaster. However, cryptfs, being a pure C implementation, uses
its own abstraction of the keymaster HAL.
This patch expresses cryptfs' keymaster abstraction in terms of
vold's C++ Keymaster abstraction, consolidating the code base to a
single point where the actual keymaster HAL is beeing used.
Test: successfully upgrade bullhead/angler while using FDE and
having a PIN set
run vold_cryptfs_scrypt_hidlization_equivalence_test
Bug:
35028230
Bug:
32020919
Change-Id: Ic3b765720be0cf7899dda5005fa89347ffb59b9f
Paul Crowley [Thu, 5 Jan 2017 06:32:40 +0000 (22:32 -0800)]
Support keys with a secret but no token, which are handled not using
Keymaster but in-process crypto.
Bug:
33384925
Test: manual for now: patch KeyAuthentication.usesKeymaster() to always return true;
flash a FBE device, add a device PIN, reboot and verify PIN can unlock FBE.
Then clear device PIN, reboot and verify FBE is unlocked automatically.
In both cases, check there is no keymaster_key_blob in
/data/misc/vold/user_keys/ce/0/current/
Unit tests to be added.
Change-Id: Ia94e2b39d60bfd98c7a8347a5ba043eeab6928c5
Paul Crowley [Mon, 13 Feb 2017 16:39:12 +0000 (16:39 +0000)]
Merge "vold: allow specifying HEH filenames encryption"
George Burgess IV [Thu, 9 Feb 2017 04:22:45 +0000 (04:22 +0000)]
Merge "Add mode bits to open calls" am:
cebf7ea40f am:
385dae25c5 am:
94f2d7653c
am:
da162a77f1 -s ours
Change-Id: I37b921fcff9a5fa5104a2e59de3e1dad48c88e1d
George Burgess IV [Thu, 9 Feb 2017 04:20:46 +0000 (04:20 +0000)]
Merge "Add mode bits to open calls" am:
cebf7ea40f am:
385dae25c5
am:
94f2d7653c
Change-Id: I4c9671b6dbc9bce7ad0b8af8021301232aa491db
George Burgess IV [Thu, 9 Feb 2017 04:18:15 +0000 (04:18 +0000)]
Merge "Add mode bits to open calls" am:
cebf7ea40f
am:
385dae25c5
Change-Id: I715bc43c7df865f350162fdf620a354782304fdf
George Burgess IV [Thu, 9 Feb 2017 04:16:45 +0000 (04:16 +0000)]
Merge "Add mode bits to open calls"
am:
cebf7ea40f
Change-Id: I8620b354dc51f500edac492b94c0bf28852f5135
Treehugger Robot [Thu, 9 Feb 2017 04:12:36 +0000 (04:12 +0000)]
Merge "Add mode bits to open calls"
Eric Biggers [Thu, 2 Feb 2017 22:52:12 +0000 (14:52 -0800)]
vold: allow specifying HEH filenames encryption
Make the vold changes needed to support specifying aes-256-heh filenames
encryption. The previous mode, aes-256-cts, remains supported as well.
The file /data/unencrypted/mode is updated to have the syntax
contents_encryption_mode[:filenames_encryption_mode] instead of just
contents_encryption_mode. This is consistent with the new fstab syntax.
Bug:
34712722
Change-Id: Ibc236d0ec4fdeda4e4e301f45fb996317692cfa3
Alex Klyubin [Mon, 6 Feb 2017 18:11:22 +0000 (10:11 -0800)]
Revert "Port cryptfs to HILD keymaster HAL"
bullhead-userdebug with disk encryption enabled and with PIN prompt at
boot can no longer unlock/mount encrypted userdata partition at boot
after updating from bullhead-userdebug prior to the two commits being
reverted here.
This reverts commit
6b7fa1bf178cd941aabe815d17da38d2e55d9867.
This reverts commit
bbe31ba776fe73da2959c5ab442e191d8371a8f3.
Test: Flash bullhead-userdebug build created prior to the above two
commits, enable disk (set PIN to 1234) with PIN required at
boot, reboot, confirm that PIN prompt accepts the PIN, confirm
that device fully boots up and appears operational. Flash build
with this commit without wiping userdata, confirm that PIN
prompt at boot accepts the PIN and device fully boots up and
appears operational.
Bug:
35028230
Change-Id: I1e9303e9d007c0c9a3021c874340156748dff5f5
Janis Danisevskis [Mon, 6 Feb 2017 11:41:31 +0000 (11:41 +0000)]
Cosmetic change to
6b7fa1b
Test: no functional change
Change-Id: I7f630473e317cbee73125955260f5aad0a000630
Janis Danisevskis [Tue, 31 Jan 2017 11:31:08 +0000 (11:31 +0000)]
Port cryptfs to HILD keymaster HAL
Cryptfs uses keymaster for key derivation. Vold has a C++ abstraction
for Keymaster. However, cryptfs, being a pure C implementation, uses
its own abstraction of the keymaster HAL.
This patch expresses cryptfs' keymaster abstraction in terms of
vold's C++ Keymaster abstraction, consolidating the code base to a
single point where the actual keymaster HAL is beeing used.
Test: marlin device boots with FBE enabled
Change-Id: Ia51fed5508e06fd6c436cca193791e57e0ab99ea
TreeHugger Robot [Mon, 30 Jan 2017 02:48:30 +0000 (02:48 +0000)]
Merge changes I00a897dd,I802e1c04
* changes:
Remove appfuse mount point directory after unmounting.
Use MNT_DETACH when unmounting appfuse mount.
George Burgess IV [Wed, 25 Jan 2017 21:12:09 +0000 (13:12 -0800)]
Add mode bits to open calls
This was already done internally a while ago, but for us to submit
clang FORTIFY, we need it here, as well.
Bug:
32073964
Test: Clang FORTIFY no longer complains about open calls here.
Change-Id: I72428ac4d3279ffc330ae5aa579960c26703053c
Merged-In: Iaed2538831b19ada26005bbef33cff28209c6512
Wei Wang [Wed, 25 Jan 2017 19:52:55 +0000 (19:52 +0000)]
Merge "Remove coldboot from vold" am:
cc29c526d4 am:
9a2e29fe32 am:
78bf4cbb12
am:
787930f5b6
Change-Id: Id9b356819d22c23d79a576851580a1016f799ecb
Wei Wang [Wed, 25 Jan 2017 19:50:28 +0000 (19:50 +0000)]
Merge "Remove coldboot from vold" am:
cc29c526d4 am:
9a2e29fe32
am:
78bf4cbb12
Change-Id: Idbeaf5ef67d59318507a83ad988a6dff45356b2b
Wei Wang [Wed, 25 Jan 2017 19:48:25 +0000 (19:48 +0000)]
Merge "Remove coldboot from vold" am:
cc29c526d4
am:
9a2e29fe32
Change-Id: I67f5eb8a7c1192449b11ffd7500222d6409d2f04
Wei Wang [Wed, 25 Jan 2017 19:45:53 +0000 (19:45 +0000)]
Merge "Remove coldboot from vold"
am:
cc29c526d4
Change-Id: I3de54db5f27692ab47ddf047ede056c536424438
Treehugger Robot [Wed, 25 Jan 2017 19:42:43 +0000 (19:42 +0000)]
Merge "Remove coldboot from vold"
Wei Wang [Fri, 20 Jan 2017 19:52:33 +0000 (11:52 -0800)]
Remove coldboot from vold
coldboot is now taken care by ueventd, so removing the duplicate
logic to save boottime.
This CL also fixes a missing lock.
Bug:
33786699
Test: manual
Change-Id: I71270252f3153abc815d142b5da7a9cb85b94dac
Daichi Hirono [Wed, 25 Jan 2017 08:16:46 +0000 (17:16 +0900)]
Remove appfuse mount point directory after unmounting.
Bug:
34691785
Test: Check if there are directories under /mnt/appfuse after
unmounting.
Change-Id: I00a897dd6d60e20b5ccfdfe2faeabb8a4f489197
Daichi Hirono [Wed, 25 Jan 2017 04:30:34 +0000 (13:30 +0900)]
Use MNT_DETACH when unmounting appfuse mount.
The system server requests unmount for appfuse when all opened file on
appfuse are closed. However the kernel sometimes returns EBUSY for
umount2 if it's just after closing all FDs on the mount point. To avoid
the case, specify MNT_DETACH to unmount.
Bug:
33363856
Test: mount and unmount appfuse repeatedly and see if unmount succeed.
Change-Id: I802e1c048357cc445febf3b95341999463a0ec65
Dimitry Ivanov [Tue, 24 Jan 2017 02:23:05 +0000 (02:23 +0000)]
Fix deadlock between vold and init am:
e74c3ea1e2
am:
84dde2e9ed
Change-Id: Iab60ec8f6a6189a2db069a95aa6da11bdf778078
Dimitry Ivanov [Tue, 24 Jan 2017 02:20:33 +0000 (02:20 +0000)]
Fix deadlock between vold and init
am:
e74c3ea1e2
Change-Id: Ie6f7dc8ad70d76275d156ab76dab5806c197fc1b
Dimitry Ivanov [Thu, 19 Jan 2017 20:48:27 +0000 (12:48 -0800)]
Fix deadlock between vold and init
By setting property after listeners are initialized
we avoid deadlock between vold and init where
vold is waiting on property_service while init is blocked
(and therefore is not able to accept connections) on vdc
which is attempting to communicate with vold.
(This also speeds up boot by 250ms)
Test: Boot a device, check locks and make sure there is no timeout
on property_set(.)
Test: Successfully boot a device with new property service protocol.
Bug: http://b/
34278978
Change-Id: I9547d2f19cb35aa452bf01fbff0eb4b32a4824a4
(cherry picked from commit
c976e73bbdfd512482d0ea0c5e10afd53ba85e1e)
TreeHugger Robot [Mon, 23 Jan 2017 22:58:28 +0000 (22:58 +0000)]
Merge "Port to binder based keymaster hal"
bowgotsai [Sat, 21 Jan 2017 13:03:42 +0000 (13:03 +0000)]
Merge "Include libavb in static libraries" am:
d65506217d am:
967f9715c3 am:
ab9218c64f
am:
efb59f9971
Change-Id: Ia64f945476f38bbe5047c5a62d4e2ff08e84eaec
bowgotsai [Sat, 21 Jan 2017 12:59:23 +0000 (12:59 +0000)]
Merge "Include libavb in static libraries" am:
d65506217d am:
967f9715c3
am:
ab9218c64f
Change-Id: If433c6eec77fce2238838ebe0259b36d8a800c7d
bowgotsai [Sat, 21 Jan 2017 12:54:51 +0000 (12:54 +0000)]
Merge "Include libavb in static libraries" am:
d65506217d
am:
967f9715c3
Change-Id: I2d9d4ff414fe970a8be246a505487a2ea4037899
bowgotsai [Sat, 21 Jan 2017 12:50:51 +0000 (12:50 +0000)]
Merge "Include libavb in static libraries"
am:
d65506217d
Change-Id: I43dac19bf88cf4caa23f4fb3a47171b8c2adfeb6
Treehugger Robot [Sat, 21 Jan 2017 12:47:03 +0000 (12:47 +0000)]
Merge "Include libavb in static libraries"
Dimitry Ivanov [Fri, 20 Jan 2017 01:35:37 +0000 (01:35 +0000)]
Merge "Fix deadlock between vold and init" am:
ec58e5851d am:
b957474b61 am:
3577e4c351
am:
4506b67f37
Change-Id: I539b878c4d7a1372a0245ca5af5d38a846f0f667
Dimitry Ivanov [Fri, 20 Jan 2017 01:24:36 +0000 (01:24 +0000)]
Merge "Fix deadlock between vold and init" am:
ec58e5851d am:
b957474b61
am:
3577e4c351
Change-Id: Ifbc94b0160c828c05c72e405ce6318a1126b2c4e
Dimitry Ivanov [Fri, 20 Jan 2017 01:20:03 +0000 (01:20 +0000)]
Merge "Fix deadlock between vold and init" am:
ec58e5851d
am:
b957474b61
Change-Id: I18eb30a8cc47596561b5264dabcad135f6c13b5d
Dimitry Ivanov [Fri, 20 Jan 2017 01:14:04 +0000 (01:14 +0000)]
Merge "Fix deadlock between vold and init"
am:
ec58e5851d
Change-Id: I542e545ae363d53f8d13ef76356518f1fe089fc3
Treehugger Robot [Fri, 20 Jan 2017 01:06:49 +0000 (01:06 +0000)]
Merge "Fix deadlock between vold and init"
Dimitry Ivanov [Thu, 19 Jan 2017 20:48:27 +0000 (12:48 -0800)]
Fix deadlock between vold and init
By setting property after listeners are initialized
we avoid deadlock between vold and init where
vold is waiting on property_service while init is blocked
(and therefore is not able to accept connections) on vdc
which is attempting to communicate with vold.
(This also speeds up boot by 250ms)
Test: Boot a device, check locks and make sure there is no timeout
on property_set(.)
Test: Successfully boot a device with new property service protocol.
Bug: http://b/
34278978
Change-Id: I9547d2f19cb35aa452bf01fbff0eb4b32a4824a4
Daichi Hirono [Fri, 2 Dec 2016 08:00:35 +0000 (17:00 +0900)]
Fix UID check in vold.
The CL fixes UID check in vold.
Previously appfuse was mounted in application's namespace. For new
public version, we mount appfuse in the system process then passes
opened files to applications.
Bug:
29970149
Test: CTS
Change-Id: Icec2e626d31d978c514eb7d1954bb59ad9556c43
Janis Danisevskis [Wed, 26 Oct 2016 13:27:10 +0000 (14:27 +0100)]
Port to binder based keymaster hal
Bug:
32020919
Change-Id: If45ece76fdaf4d2c80eddc537e429633e4d42f9d
bowgotsai [Fri, 6 Jan 2017 16:44:35 +0000 (00:44 +0800)]
Include libavb in static libraries
Bug:
31264231
Test: compile
Change-Id: I1d84f7aa67a0ed31f2b6400cf1c9567bf503295a
Andrew Scull [Mon, 31 Oct 2016 10:28:25 +0000 (10:28 +0000)]
Evict CE keys on request or when a user is removed.
A work around for a kernel bug is needed to avoid the phone locking up
and turning into a hand warmer.
Test: com.android.cts.devicepolicy.ManagedProfileTest#testLockNowWithKeyEviction*
Bug:
31000719
Change-Id: Ia2121b3e3c22b10351296fa998892a91e601bb2c
Paul Crowley [Tue, 6 Dec 2016 16:22:04 +0000 (08:22 -0800)]
Enable building and running the vold_tests module as part of a
standard build; make it use only static libraries as per documented
limitations of APCT.
Bug:
33384925
Test: This is a test.
Change-Id: I794adbfa3376795120cfbca1e9322093960009b5
Adrien Schildknecht [Sat, 3 Dec 2016 04:20:13 +0000 (04:20 +0000)]
Manually merge commit '
b406ffa' into stage-aosp-master am:
04c55e6ed7 am:
93722ead06
am:
43100e580f
Change-Id: I8a74fd730f0aa5a1f94c04c12286e96ac299b463
Adrien Schildknecht [Sat, 3 Dec 2016 04:15:10 +0000 (04:15 +0000)]
Manually merge commit '
b406ffa' into stage-aosp-master am:
04c55e6ed7
am:
93722ead06
Change-Id: I25c4f8f2f833360b39939360ad400e6ed21fc176
Adrien Schildknecht [Sat, 3 Dec 2016 04:13:11 +0000 (04:13 +0000)]
Manually merge commit '
b406ffa' into stage-aosp-master
am:
04c55e6ed7
Change-Id: I77bbb46dfd8f49ed96c3f590d719b511eff55aa6
The Android Automerger [Sat, 3 Dec 2016 04:08:35 +0000 (04:08 +0000)]
Manually merge commit '
b406ffa' into stage-aosp-master
* commit '
b406ffa':
Add support for creating ext4 images with mke2fs
BUG:
33304034
Treehugger Robot [Fri, 2 Dec 2016 22:48:21 +0000 (22:48 +0000)]
Merge "Add support for creating ext4 images with mke2fs"
Adrien Schildknecht [Mon, 21 Nov 2016 23:14:37 +0000 (15:14 -0800)]
Add support for creating ext4 images with mke2fs
We are investigating replacing make_ext4fs with the upstream tool mke2fs.
See b/
23686092 for more informations.
To mitigate the trouble that may arise if the new tool behave differently
compared to the old one, there will be a transition period where both mke2fs
and make_ext4fs will be supported.
This patch does 3 things:
- add the necessary code to use mke2fs to format an ext4 partition;
- add a dependency to the binary used by vold.
Test: m -j32 with TARGET_USES_MKE2FS={,false,true}
TARGET_USERIMAGES_USE_EXT4={,true}
Change-Id: I89222642fe1d11a035155c8224b84b2e3719938b
Paul Crowley [Fri, 28 Oct 2016 21:33:27 +0000 (21:33 +0000)]
Merge "Remove misleading comment (b/
26948053)" am:
dbeebf56aa am:
4f70554179 am:
32b7443757
am:
6984a92aa9
Change-Id: I01c7376d6e25796eaa9448506d17eb318f3bdedb
Paul Crowley [Fri, 28 Oct 2016 21:25:23 +0000 (21:25 +0000)]
Merge "Remove misleading comment (b/
26948053)" am:
dbeebf56aa am:
4f70554179
am:
32b7443757
Change-Id: I8b68a90f11d2b7b66085609a122515a68bac48bb
Paul Crowley [Fri, 28 Oct 2016 21:20:28 +0000 (21:20 +0000)]
Merge "Remove misleading comment (b/
26948053)" am:
dbeebf56aa
am:
4f70554179
Change-Id: I18b4e8c975342a0b79d9a88082c1e9b4f0a6682b
Paul Crowley [Fri, 28 Oct 2016 21:14:50 +0000 (21:14 +0000)]
Merge "Remove misleading comment (b/
26948053)"
am:
dbeebf56aa
Change-Id: I6e63f700ecd9cad50956cc2a1cc34b4f81b1a497
Treehugger Robot [Fri, 28 Oct 2016 21:08:16 +0000 (21:08 +0000)]
Merge "Remove misleading comment (b/
26948053)"
Rahul Chaudhry [Thu, 20 Oct 2016 03:38:54 +0000 (03:38 +0000)]
Merge "system/vold: cleanup compiler warnings (read of uninitialized memory)." am:
cda5cec39f am:
e9e23bf019
am:
543080cdf3
Change-Id: Icf701e8675c8d50f81e3a8f0d0de5716c25696ef
Rahul Chaudhry [Thu, 20 Oct 2016 03:29:37 +0000 (03:29 +0000)]
Merge "system/vold: cleanup compiler warnings (read of uninitialized memory)." am:
cda5cec39f
am:
e9e23bf019
Change-Id: Ic4e45522f591c296f6975f288c5dccd059b00314
Rahul Chaudhry [Thu, 20 Oct 2016 03:21:06 +0000 (03:21 +0000)]
Merge "system/vold: cleanup compiler warnings (read of uninitialized memory)."
am:
cda5cec39f
Change-Id: I5fdde841ee42e3a48c042538732f22f0fe3eedf9
Treehugger Robot [Thu, 20 Oct 2016 03:15:24 +0000 (03:15 +0000)]
Merge "system/vold: cleanup compiler warnings (read of uninitialized memory)."
Rahul Chaudhry [Thu, 20 Oct 2016 00:58:32 +0000 (17:58 -0700)]
system/vold: cleanup compiler warnings (read of uninitialized memory).
system/vold/ScryptParameters.cpp:48:26: warning: Assigned value is
garbage or undefined
system/vold/ScryptParameters.cpp:48:43: warning: Assigned value is
garbage or undefined
system/vold/ScryptParameters.cpp:48:9: warning: Assigned value is
garbage or undefined
Bug:
26936282
Test: WITH_TIDY=1 WITH_STATIC_ANALYZER=1 mm
Change-Id: I82ffffee48ee94ca5c7f3bbc64059f9cec109a92
Paul Crowley [Wed, 19 Oct 2016 21:00:24 +0000 (14:00 -0700)]
Remove misleading comment (b/
26948053)
Vold is considered part of our trusted computing base, and
compromising vold is already identified as a complete device
compromise. While storing keys only in the kernel would be better, the
current setup does not introduce a security bug or worsen any security
control.
Bug:
26948053
Test: Comment-only change.
Change-Id: Ib5436f4386769ec44b74dc6b50fbcc0fed99b96b