Commit graph

1034 commits

Author SHA1 Message Date
Jeff Sharkey
385ca5d236 Merge "Handle non-format partition in Vold" 2015-12-03 17:40:21 +00:00
Jeff Sharkey
e0e5bfeb3c Merge "Make sure path is not NULL to avoid fatal exception." 2015-12-03 17:39:39 +00:00
Jeff Sharkey
3e6c59dc16 Merge "vold: fix 64 bit ioctl error" 2015-12-03 16:56:13 +00:00
Kenny Root
0a7e668ebf Merge "system/vold: check return value of PKCS5_PBKDF2_HMAC_SHA1." 2015-11-06 17:20:30 +00:00
Adam Langley
bf0d972ab4 system/vold: check return value of PKCS5_PBKDF2_HMAC_SHA1.
The function PKCS5_PBKDF2_HMAC_SHA1 can fail for a number of reasons and
thus its return value should be checked and handled.

Change-Id: I0f0d8f74b58940a34df16b88434a085760822075
2015-11-04 14:51:39 -08:00
Elliott Hughes
5cd32f73d8 Merge "Fix ioctl parameter"
am: 0eaad8ce8c

* commit '0eaad8ce8ceaa4b730b0be8c149f389647fbdab0':
  Fix ioctl parameter
2015-10-29 20:41:28 +00:00
Elliott Hughes
0eaad8ce8c Merge "Fix ioctl parameter" 2015-10-29 20:38:10 +00:00
caozhiyuan
9102b0b175 Fix ioctl parameter
Change-Id: I922c8ae77056db81bc5152346299a07a34c527d2
2015-10-29 08:48:20 +00:00
Jeff Sharkey
d3c7060ba5 Merge "Promote free bytes calculation to 64 bits"
am: 7d17af08a8

* commit '7d17af08a80c3d9a14a3fe11d70bd12d59641a7b':
  Promote free bytes calculation to 64 bits
2015-10-21 15:58:40 +00:00
Jeff Sharkey
7d17af08a8 Merge "Promote free bytes calculation to 64 bits" 2015-10-21 15:44:36 +00:00
Mateusz Nowak
a4f48d0f44 vold: fix 64 bit ioctl error
Changing the num_sectors used in ioctl with BLKGETSIZE because
the kernel expects an unsigned long type and then changes 64 bits
with a 64 bits userspace. This overwrites what's located close to
the parameter location if any.

Change-Id: I78fd61a1084de2741f39b926aa436462518709a0
Signed-off-by: Mateusz Nowak <mateusz.nowak@intel.com>
Signed-off-by: Zhiquan Liu <zhiquan.liu@intel.com>
2015-10-21 11:16:19 +08:00
Mateusz Nowak
6440379f1b Make sure path is not NULL to avoid fatal exception.
Change-Id: I75fd5d90cf0f75c28e75582fcae934afa4bf29c4
Signed-off-by: Mateusz Nowak <mateusz.nowak@intel.com>
Signed-off-by: Zhiquan Liu <zhiquan.liu@intel.com>
2015-10-21 11:15:39 +08:00
Mateusz Nowak
3dd39309d0 Handle non-format partition in Vold
fsck_msdos will retun error code 8 when the partition is non-format.
Handle this error code and continue next partition in Vold.

Change-Id: I31499ccb16945ffbc67bdc92dfbc3ea71e82573a
Signed-off-by: Mateusz Nowak <mateusz.nowak@intel.com>
Signed-off-by: Zhiquan Liu <zhiquan.liu@intel.com>
2015-10-21 11:14:47 +08:00
Oleksiy Avramchenko
e76cf536a4 Promote free bytes calculation to 64 bits
The expression otherwise overflows for large devices.
It's fsblkcnt_t -> unsigned long, which is 32 bit on ARMv7.

Change-Id: I46c5e00558b7dbd6abd50fae4727396079044df2
2015-10-07 13:13:38 +02:00
Sami Tolvanen
f0500a0823 am 0331d4ae: am 685dfdd3: Merge "Error correction: Add libfec dependencies for vold"
* commit '0331d4ae3843f682e98bfa1aba0f8da7fbd9beb0':
  Error correction: Add libfec dependencies for vold
2015-10-02 10:55:10 +00:00
Sami Tolvanen
0331d4ae38 am 685dfdd3: Merge "Error correction: Add libfec dependencies for vold"
* commit '685dfdd33590ef8a93627015c434fea54b8f1b4d':
  Error correction: Add libfec dependencies for vold
2015-10-02 10:47:23 +00:00
Sami Tolvanen
685dfdd335 Merge "Error correction: Add libfec dependencies for vold" 2015-10-02 10:42:16 +00:00
David Ng
44710f0f9c am 82fd804f: vold: Retry opening block device on failure when starting encryption
* commit '82fd804f8ba49399f425bf43681b9b7fe464d9a1':
  vold: Retry opening block device on failure when starting encryption
2015-10-02 08:27:19 +00:00
David Ng
82fd804f8b vold: Retry opening block device on failure when starting encryption
The device mapper storage device node can take some time to be
created; so retry.

Bug: 23024596
Change-Id: Ieeb3b697f9cef72d4ea9d106750696901f0a224d
2015-10-01 11:45:22 +01:00
Sami Tolvanen
efe67cd25d Error correction: Add libfec dependencies for vold
Vold requires libfec and related dependencies due to fs_mgr_mount_all.

Bug: 21893453
Change-Id: If59df0c5fd3395d4aac97dd8119b7c70c0fa5d4d
2015-09-29 14:55:35 +01:00
Jeff Sharkey
1690c1bca2 am 1a20a648: Enable benchmark after trim, when requested.
* commit '1a20a6487faad2869eaec962e4373402aa7461b3':
  Enable benchmark after trim, when requested.
2015-09-10 00:44:21 +00:00
Jeff Sharkey
1a20a6487f Enable benchmark after trim, when requested.
The framework can request that a benchmark be run after an fstrim,
but it was disabled due to a kernel bug on certain devices.  That bug
has long been fixed, so it should be safe to enable this again.

Bug: 23942769
Change-Id: Ibe967a75856d0cbad45e2f8f3120f1970caf36d0
2015-09-09 14:55:45 -07:00
Paul Crowley
2ada951768 am 480fcd27: Set uid/gid of newly created user dirs to system/system.
* commit '480fcd2750c1d30f3397d1f3152519a11f60990b':
  Set uid/gid of newly created user dirs to system/system.
2015-09-03 06:21:41 +00:00
Tom Cherry
fa68681ac7 am 79b6fdfc: (-s ours) update bundled rc files to their contents from rootdir/init.rc
* commit '79b6fdfcea593b9f1a2422f1327a279ee77a54c2':
  update bundled rc files to their contents from rootdir/init.rc
2015-08-27 11:17:54 +00:00
Tom Cherry
efbaf0de36 am 685439bb: (-s ours) am 218f48d6: Merge "bundle init.rc contents with its service"
* commit '685439bbc7ef958a3472465ebdabf2b997889e76':
2015-08-27 11:17:53 +00:00
Elliott Hughes
debb3f8cba am b1259ffd: (-s ours) am f298f6be: Merge "Use errno correctly."
* commit 'b1259ffd92f8965521f3f934548936dfd7650262':
2015-08-27 11:17:53 +00:00
Elliott Hughes
d9aea039e8 am 3097d0e1: (-s ours) am 6d24e086: Merge "Remove dead code."
* commit '3097d0e151b4f07552e987ee5819e9e7c6953a71':
2015-08-27 11:17:52 +00:00
Jeff Sharkey
88fbc74295 am 7206b42b: (-s ours) am eddf9bd6: Request specific tags from blkid.
* commit '7206b42badd044e3fcc75c1e1e842bf6d5475867':
2015-08-27 11:17:51 +00:00
Jeff Sharkey
fce8034b3e am 2b8f194f: (-s ours) am 1bd078fa: Protect runtime storage mount points.
* commit '2b8f194f1a3c4929e7921a3cb31defd98579e87c':
2015-08-27 11:17:51 +00:00
Jeff Sharkey
489fce1c85 am 3a60599a: (-s ours) am 8474ee32: Return useful path when not visible.
* commit '3a60599ae83aadc9eb2dcc5f645508100ede58f9':
2015-08-27 11:17:49 +00:00
Jeff Sharkey
c4ecb51750 am 26934b09: (-s ours) am d46687ee: Use random data for benchmark instead of zeros.
* commit '26934b0954f28d2d465097bf78f6be0139839b14':
2015-08-27 11:17:48 +00:00
Jeff Sharkey
e7556ee814 am 09b542f2: (-s ours) am 20642ae7: Give secondary users read-only physical cards.
* commit '09b542f269bfd0726de53c2d230c5266f5227f1c':
2015-08-27 11:17:47 +00:00
Jeff Sharkey
8a28676289 am 15c6489a: (-s ours) am 32679a82: Create user directory on emulated storage.
* commit '15c6489aa9de4a11f4ec25b69841fb1c936b6380':
2015-08-27 11:17:46 +00:00
Jeff Sharkey
287cc74d0e am 0d3fe815: (-s ours) am 81f55c6d: Mount emulated volumes as consistent location.
* commit '0d3fe8152ef0e15bd4105013faaee7961e6a6ea9':
2015-08-27 11:17:46 +00:00
Paul Crowley
480fcd2750 Set uid/gid of newly created user dirs to system/system.
Bug: 23395513
Change-Id: I3d76b77339f995103c0aec09c6de77b3c8cdc0dd
2015-08-24 14:53:28 +01:00
Tom Cherry
205a874e86 update bundled rc files to their contents from rootdir/init.rc
Bug 23186545

Change-Id: I634b682b7a4cef9e1b817561b4458e1442443c63
(cherry picked from commit 6cb234dc57)
2015-08-21 22:10:23 +00:00
Tom Cherry
79b6fdfcea update bundled rc files to their contents from rootdir/init.rc
Bug 23186545

Change-Id: I634b682b7a4cef9e1b817561b4458e1442443c63
(cherry picked from commit 6cb234dc57)
2015-08-21 21:55:01 +00:00
Tom Cherry
10b02df820 am 218f48d6: Merge "bundle init.rc contents with its service"
* commit '218f48d6c55a7ee5115a7a8fc4248d33ea01811f':
  bundle init.rc contents with its service
2015-08-21 18:24:14 +00:00
Tom Cherry
685439bbc7 am 218f48d6: Merge "bundle init.rc contents with its service"
* commit '218f48d6c55a7ee5115a7a8fc4248d33ea01811f':
  bundle init.rc contents with its service
2015-08-21 18:20:19 +00:00
Tom Cherry
218f48d6c5 Merge "bundle init.rc contents with its service" 2015-08-21 17:42:33 +00:00
Tom Cherry
a285984ae4 bundle init.rc contents with its service
Bug: 23186545
Change-Id: I82d8b6dc54ebe32ceb1ed997aaab3701ee7b6c4a
2015-08-19 17:36:11 -07:00
Elliott Hughes
b1259ffd92 am f298f6be: Merge "Use errno correctly."
* commit 'f298f6be4c8df8745735676e37ccc963909ff3b2':
  Use errno correctly.
2015-08-17 17:43:54 +00:00
Elliott Hughes
ad6bd04387 am f298f6be: Merge "Use errno correctly."
* commit 'f298f6be4c8df8745735676e37ccc963909ff3b2':
  Use errno correctly.
2015-08-17 17:43:52 +00:00
Elliott Hughes
f298f6be4c Merge "Use errno correctly." 2015-08-17 17:33:35 +00:00
tao.pei
a1038a9566 Use errno correctly.
Make sure to check errno prior to doing anything
else that can modify it.

Change-Id: Id81ecc2c3fa07c222ab1e2ef6441331a1eaad635
2015-08-17 20:22:17 +08:00
Elliott Hughes
5e7f772dbd am 6d24e086: Merge "Remove dead code."
* commit '6d24e0866f61aba0ac3023408ead083ad9b6cdab':
  Remove dead code.
2015-08-15 02:19:16 +00:00
Elliott Hughes
3097d0e151 am 6d24e086: Merge "Remove dead code."
* commit '6d24e0866f61aba0ac3023408ead083ad9b6cdab':
  Remove dead code.
2015-08-15 02:19:04 +00:00
Elliott Hughes
6d24e0866f Merge "Remove dead code." 2015-08-15 02:06:36 +00:00
Elliott Hughes
c569f528a2 Remove dead code.
Change-Id: I042f8aacfa8a7900b5684aaa24da368cdcb41b1f
2015-08-14 18:41:14 -07:00
Jeff Sharkey
7206b42bad am eddf9bd6: Request specific tags from blkid.
* commit 'eddf9bd63c1f7e0f9709f7c58a1035fa43338325':
  Request specific tags from blkid.
2015-08-13 00:43:05 +00:00