Commit graph

2535 commits

Author SHA1 Message Date
Treehugger Robot
13755d81be Merge "Includes new static libfs_avb" 2018-11-30 06:59:38 +00:00
Treehugger Robot
7be8a7ee1d Merge "Extract AppFuse as a util" 2018-11-30 05:05:10 +00:00
Bowgo Tsai
549fd0e9ae Includes new static libfs_avb
Bug: 112103720
Test: boot crosshatch_mainline-userdebug
Change-Id: If33f6dbf7a31d57f61c0aca0296f2ff06c8b4a86
2018-11-29 22:17:24 +08:00
Bill Yi
e101e8712e Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-release
Change-Id: I090e55f0f34ff556118caaecbb21169580c66ab6
2018-11-28 18:35:05 -08:00
LongPing.WEI
2255cf528f Merge "Use setmntent with "e" option" am: 396040ca2c
am: a92bdeb7f5

Change-Id: I269ba8a35f5441e78c6d7945ce4726eae3e33cdd
2018-11-28 09:59:12 -08:00
LongPing.WEI
a92bdeb7f5 Merge "Use setmntent with "e" option"
am: 396040ca2c

Change-Id: I4ccb2a328f1203ab1fc9d5c58d89551f737d58b6
2018-11-28 09:55:03 -08:00
Treehugger Robot
396040ca2c Merge "Use setmntent with "e" option" 2018-11-28 17:49:17 +00:00
LongPing.WEI
4f04606811 Use setmntent with "e" option
Otherwise it will cause selinux warning in children processes sometimes

Change-Id: I41239c3f9779140622076c644a5f63051d00eaa8
2018-11-23 19:27:35 +08:00
Daniel Rosenberg
bc03daec62 Merge "Fix error reporting in cp_commitChanges" am: 2a683d4ce6
am: b0b31d360d

Change-Id: I71ba57abf41afaae7b9f08ed4490fb2c08b5dfe4
2018-11-20 14:54:14 -08:00
Daniel Rosenberg
b0b31d360d Merge "Fix error reporting in cp_commitChanges"
am: 2a683d4ce6

Change-Id: Ie997ca2fac3a6cd8421fdae6617e016b4533486f
2018-11-20 14:14:41 -08:00
Daniel Rosenberg
2a683d4ce6 Merge "Fix error reporting in cp_commitChanges" 2018-11-20 21:58:20 +00:00
Daniel Rosenberg
4b86df1426 Fix error reporting in cp_commitChanges
Only trys to commit if necessary, and reports errors
if commiting fails. RemoveFileIfExists returns true on
success.

Test: vdc checkpoint startCheckpoint, reboot, and then
      vdc checkpoint commitChanges
Bug: 111020314

Change-Id: Ie1b3e49beb3ca04f2881fcc595882c607368b477
2018-11-19 23:47:03 +00:00
Jie
fd2eabf1e6 Merge "Add fsync for renaming user ce key path" am: 622585b11b
am: c26ff35858

Change-Id: Ia569027d46e853adeb868f5c4bd83b4619452c61
2018-11-15 13:52:21 -08:00
Jie
c26ff35858 Merge "Add fsync for renaming user ce key path"
am: 622585b11b

Change-Id: Ic110b6725790398a235d0766330b0899ab52bedb
2018-11-15 13:45:12 -08:00
Treehugger Robot
622585b11b Merge "Add fsync for renaming user ce key path" 2018-11-15 21:35:25 +00:00
Jie
b6698d56ac Add fsync for renaming user ce key path
Device can't start up after the following steps:
1. set screen lock to PIN/Pattern/Password
2. set screen lock to Swipe/None
3. power down immediately after pressing "YES, REMOVE"
4. reboot

failed log:
Failed to read from /data/misc/vold/user_keys/ce/0/current/keymaster_key_blob

root cause:
flushing data failed because of power down

issue:
https://partnerissuetracker.corp.google.com/u/1/issues/119382750
2018-11-15 06:25:37 +00:00
Risan
c4381df50a Merge "Change AppFuse mount location to vold namespace" am: b2455747a9
am: 996963c938

Change-Id: I416009aac32118613ffdade06280a1a848e9ec18
2018-11-14 00:10:35 -08:00
Risan
996963c938 Merge "Change AppFuse mount location to vold namespace"
am: b2455747a9

Change-Id: I59cb49859d9622dd460e61e1b55220dd04585ad5
2018-11-13 23:45:19 -08:00
Risan
dcbd4fcad2 ARC++ swap for AppFuseUtil
Bug: 110379912
Test: Compiled.
Change-Id: Ib7910ba4df6c60d7125a07b07c62612ed4146ddb
Merged-In: Ib7910ba4df6c60d7125a07b07c62612ed4146ddb
2018-11-14 07:28:36 +00:00
Risan
ac02a4863f Extract AppFuse as a util
Bug: 110379912
Test: testOpenProxyFileDescriptor
Change-Id: I0429a498d7b54682efe9b05815f3470e8745609e
2018-11-14 07:28:06 +00:00
Treehugger Robot
b2455747a9 Merge "Change AppFuse mount location to vold namespace" 2018-11-14 07:27:38 +00:00
Risan
5f53cd3b79 Change AppFuse mount location to vold namespace
Previously, AppFuse is mounted in system_server's mount namespace. This
CL moves the mount location to vold namespace.

Bug: 110379912
Test: testOpenProxyFileDescriptor passes
Change-Id: Id93c26d5a98842c78f27850c83e15df619cec1ab
2018-11-13 22:46:23 +00:00
Risan
a294e197b4 Merge "StubVolume as first class Volume in Vold" am: dcbce84fed
am: 14955896e5

Change-Id: Ia19e2984d9b2fe3f9c44abf40ea94463988ed910
2018-11-13 11:58:02 -08:00
Risan
14955896e5 Merge "StubVolume as first class Volume in Vold"
am: dcbce84fed

Change-Id: Ib8b824d0a9b68864988277d803e094a73f7e7905
2018-11-13 11:45:19 -08:00
Treehugger Robot
dcbce84fed Merge "StubVolume as first class Volume in Vold" 2018-11-13 19:20:38 +00:00
Risan
8c9f33242f StubVolume as first class Volume in Vold
StubVolume is a Volume that is maintained by external party such as the
ChromeOS processes in ARC++.

Bug: 110380403
Test: Tested on ARC++

Change-Id: I3198bd7283d5f60a524da3707dea7385ffec599d
2018-11-08 07:40:43 +00:00
Paul Crowley
f56ae9c612 Merge "Wait for dm device to be ready before format" am: b3001b9f28
am: 65faa9850c

Change-Id: I3ab6bd7fd3c216b647b9a7552b28c2f2be285fdb
2018-11-05 15:14:34 -08:00
Paul Crowley
65faa9850c Merge "Wait for dm device to be ready before format"
am: b3001b9f28

Change-Id: Ifa756a04027932a99ec35732f9f91f31bc1bcc9e
2018-11-05 15:09:32 -08:00
Treehugger Robot
b3001b9f28 Merge "Wait for dm device to be ready before format" 2018-11-05 22:53:27 +00:00
Paul Crowley
cfe3972f2d Wait for dm device to be ready before format
It can sometimes take a moment for the dm-device to appear after
creation, causing operations on it such as formatting to fail.
Ensure the device exists before create_crypto_blk_dev returns.

Test: adb sm set-virtual-disk true and format as adoptable.
Bug: 117586466
Change-Id: Id8f571b551f50fc759e78d917e4ac3080e926722
Merged-In: Id8f571b551f50fc759e78d917e4ac3080e926722
2018-11-05 13:59:08 -08:00
Eric Biggers
4209eb4138 Merge changes from topic "e4crypt_to_fscrypt" am: ddbd8325f5
am: e6680f17a8

Change-Id: Ie093f99065ac99b31ab92910b5618473057c07e2
2018-10-29 10:36:57 -07:00
Eric Biggers
a51283d281 vold: rename from "ext4 encryption" to fscrypt am: a701c458ca
am: 10b70834a4

Change-Id: I20fc4fef6b5bb5fd9062d0f1c6d83668a32e67dd
2018-10-29 10:36:49 -07:00
Eric Biggers
e6680f17a8 Merge changes from topic "e4crypt_to_fscrypt"
am: ddbd8325f5

Change-Id: Ifbe5a1bfd2d9a4b0e97197ab91358df356b0d0b2
2018-10-29 10:32:57 -07:00
Eric Biggers
10b70834a4 vold: rename from "ext4 encryption" to fscrypt
am: a701c458ca

Change-Id: I2433a349e40e530439bdc84d39b6295213597b9e
2018-10-29 10:32:49 -07:00
Eric Biggers
ddbd8325f5 Merge changes from topic "e4crypt_to_fscrypt"
* changes:
  vold: get the fscrypt kernel API declarations from linux/fs.h
  vold: rename from "ext4 encryption" to fscrypt
2018-10-29 17:19:39 +00:00
Eric Biggers
a701c458ca vold: rename from "ext4 encryption" to fscrypt
We support file-based encryption on both ext4 and f2fs now, and the
kernel API is the same.  So rename things appropriately in vold:

    e4crypt => fscrypt
    ext4enc => fscrypt
    Ext4Crypt => FsCrypt
    EXT4_* => FS_*
    ext4_encryption_key => fscrypt_key

Additionally, the common functions shared by 'vold' and 'init' are now
in libfscrypt rather than ext4_utils.  So update vold to link to
libfscrypt and include the renamed headers.

Note: there's a chance of 'fscrypt' being confused with the dm-crypt
based encryption code in vold which is called 'cryptfs'.  However,
fscrypt is the name used in the kernel for ext4/f2fs/ubifs encryption,
and it's preferable to use the same name in userspace.

Test: built, booted device with f2fs encryption
Change-Id: I2a46a49f30d9c0b73d6f6fe09e4a4904d4138ff6
2018-10-25 17:12:32 -07:00
Eric Biggers
ba997ee583 vold: get the fscrypt kernel API declarations from linux/fs.h
bionic now has linux/fs.h from the 4.14 kernel, which has the fscrypt
kernel API declarations.  Replace the manual declarations in vold,
except for FS_AES_256_XTS_KEY_SIZE which is not available.

Test: built, booted device with f2fs encryption
Change-Id: I6a0e3117eaebe3baac7385421afce2169d46ad55
2018-10-25 17:12:32 -07:00
Bill Yi
5cd7febde2 [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 0016efbc44 -s ours
am: 92e9696929  -s ours

Change-Id: I3f2318412bc9efd76c17138164bc9e605932361f
2018-10-24 19:07:48 -07:00
Bill Yi
92e9696929 [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE
am: 0016efbc44  -s ours

Change-Id: I4f58d060b74eb50c3287390c205b90629a601304
2018-10-24 16:40:33 -07:00
Bill Yi
0016efbc44 Merge pie-platform-release to aosp-master - DO NOT MERGE
Change-Id: I112d144eac39f426e22d3a66e4fe298306010c13
2018-10-24 14:48:22 -07:00
Bill Yi
02c6d9c484 [automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
am: f7885c7757  -s ours

Change-Id: I8be8bcca9f258cce95a9ec390f281034dc5f4fd7
2018-10-24 10:15:02 -07:00
Bill Yi
f7885c7757 Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
Change-Id: I535e6ec4e1ceed5e57d32353caaac7126752c7dc
2018-10-24 09:08:01 -07:00
android-build-team Robot
96ac6dd24d Merge cherrypicks of [5317808, 5317809, 5318498, 5317873, 5318338, 5318195, 5318499, 5317874, 5317875, 5317876, 5318243, 5318244, 5318537, 5318538, 5318539, 5318540, 5318541, 5318542, 5318543, 5318544, 5318545, 5318546, 5315210, 5317756, 5318557, 5318558, 5318559, 5318560, 5318561, 5318339, 5318547, 5318548, 5318549, 5318562, 5318563, 5318564, 5318565, 5318566, 5318172, 5318173, 5318174, 5318550, 5318401, 5318196, 5317889, 5318175, 5318176, 5318577, 5318578, 5318579, 5318580, 5318581, 5318503, 5318390, 5318505, 5318341, 5318551] into pi-qpr1-release
Change-Id: Ia6434abde93ea6328659f8f08c3d5dbe4e69291d
2018-10-20 00:21:03 +00:00
Rubin Xu
94b9956824 [DO NOT MERGE] Fix signedness mismatch and integer underflow
persist_get_max_entries() is supposed to return an unsigned integer as the
maximum number of entries but it also wrongly returns "-1" as an error
condition. Also fix an issue where an unsigned subtraction in this routine
could lead to integer underflow.

Bug: 112731440
Test: manual
Change-Id: I9672e39bef2c12156dda7806a08c52044962c178
(cherry picked from commit 19ef1ae99a)
2018-10-20 00:18:34 +00:00
Bill Yi
b4f22add1a Merge pi-dr1-dev to aosp-master am: 8b1136c831
am: 71e738ce4f

Change-Id: I181b22eda4668b23b9d7254b3eeadb64e5e8c382
2018-10-19 15:19:37 -07:00
Bill Yi
71e738ce4f Merge pi-dr1-dev to aosp-master
am: 8b1136c831

Change-Id: I4459543720b4b50525087b3c8b9dd93ef5448f24
2018-10-19 15:04:46 -07:00
Bill Yi
8b1136c831 Merge pi-dr1-dev to aosp-master
Change-Id: I5f9eb0c7ea0a3ba88865854e28b73806011d323e
2018-10-19 12:20:56 -07:00
Daniel Rosenberg
ea1891bc2b [automerger skipped] Merge "Remove spurious function declaration" am: 090e05bd02 -s ours
am: aeac5d5f57  -s ours

Change-Id: Ic5c0ceb3398da3c3a92e370b3d7edb70884f902c
2018-10-16 17:25:57 -07:00
Daniel Rosenberg
aeac5d5f57 [automerger skipped] Merge "Remove spurious function declaration"
am: 090e05bd02  -s ours

Change-Id: I919eeb0ec529c444ea0a32835a4b0306c07fab45
2018-10-16 17:12:32 -07:00
Treehugger Robot
090e05bd02 Merge "Remove spurious function declaration" 2018-10-16 23:55:28 +00:00