Commit graph

2093 commits

Author SHA1 Message Date
Paul Crowley
14c8c0765a clang-format many files.
Test: Format-only changes; treehugger suffices.
Change-Id: I23cde3f0bbcac13bef555d13514e922c79d5ad48
2018-09-18 15:41:22 -07:00
Jaegeuk Kim
1251ef0bcf vold: metadata encryption: ensure F2FS GC targets correct device.
This fixes F2FS GC failure in idle-maint.

Bug: 111953875
Change-Id: I1d10802121d5641cf9ba780fee249affd2cf6ffe
Merged-In: I1d10802121d5641cf9ba780fee249affd2cf6ffe
Test: Tested by hand
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
2018-09-18 13:14:34 -07:00
Treehugger Robot
6418bb7d34 Merge "Do not crash if secontext is nullptr" 2018-09-18 14:15:13 +00:00
Roman Kiryanov
bda3032fcc Do not crash if secontext is nullptr
LOG(DEBUG) tries to print a string pointed by secontext.get() but
crashed if it was nullptr.

Bug: 111888637
Test: "make -j50" and ran emulator
Change-Id: Iac78f650e7f48781030dc610f7d35cd52c250802
Merged-In: Iac78f650e7f48781030dc610f7d35cd52c250802
Signed-off-by: Roman Kiryanov <rkir@google.com>
2018-09-17 16:15:33 -07:00
Treehugger Robot
fa96af82f3 Merge "vold uses health filesystem HAL" 2018-09-17 22:30:34 +00:00
Yifan Hong
024a1241a6 vold uses health filesystem HAL
to runDevGc(). This fixes a Treble violation.
Bug: 111655771
Test: manual

Change-Id: I53d6db6ffa99e43e281f8086442151692c1826ca
2018-09-17 10:06:57 -07:00
Treehugger Robot
3a7f95af09 Merge "fix wrong ioctl direction for F2FS_IOC_GET_PIN_FILE" 2018-09-13 19:03:41 +00:00
Jaegeuk Kim
1dcfbe2a01 fix wrong ioctl direction for F2FS_IOC_GET_PIN_FILE
Change-Id: I0cf212c3e1770e233ae1f70e7fc4a6d70b82583e
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
2018-09-12 10:10:51 -07:00
Treehugger Robot
de85ef5c37 Merge "vold should be fully developed in AOSP." 2018-09-11 20:50:05 +00:00
Jeff Sharkey
8ecdb493d9 vold should be fully developed in AOSP.
Bug: 113136846
Test: manual
Change-Id: Ifdd54260153d47e47aca5f422bffcc828d45dc28
2018-09-11 12:08:43 -06:00
Treehugger Robot
732def209c Merge "vold: Grant root group" 2018-08-13 20:54:13 +00:00
Jaegeuk Kim
c0eea5736e vold: Grant root group
When using make_f2fs to format a filesystem with quota enabled, make_f2fs
will write quota record with group id equtal to make_f2fs's execution
group id.
Vold shall run as root group so that make_f2fs forked by vold will enherit
vold's root group. Make_f2fs can then write quota record with group id for
root group and therefore kernel quota driver can find quota record for
root group.

Bug: 111775499
Change-Id: I0c1fef760597d1695586d24365200b25e2cf07e6
Signed-off-by: Light Hsieh <light.hsieh@mediatek.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
2018-08-08 17:08:02 -07:00
Treehugger Robot
92f5db4a06 Merge "Switch pattern/PIN constants to match values in cryptfs.h" 2018-08-07 22:03:11 +00:00
Treehugger Robot
cf0cb0bc1f Merge "cryptfs: Remove Speck support" 2018-08-07 21:11:50 +00:00
Paul Crowley
ca08c0a724 Switch pattern/PIN constants to match values in cryptfs.h
Bug: 111051602
Test: Steps to reproduce in b/111051602
Change-Id: I21955f41d2594917d5baa1bc4d61da0106cd9170
2018-08-07 10:19:05 -07:00
Greg Kaiser
b353a61292 cryptfs: Remove Speck support
Remove the Speck encryption support. It was eventually
decided not to allow Speck in Android P, so this code
is no longer needed and wasn't used outside of testing.

Note we don't just "git revert" the original commit
(38723f23ff) because we want
to retain the infrastructure for allowing new types of
crypto algorithms in the future.

Bug: 112009351
Test: Attempted to setup a device with ro.crypto.fde_algorithm set to Speck, and Speck was rejected and the system defaulted to AES.
Change-Id: I69a8b4e8632f8d30b5b54783cb986ab42d4397d9
2018-08-07 10:11:05 -07:00
Xin Li
7fcaa13d4c Merge "Merge Android Pie into master" 2018-08-07 16:51:28 +00:00
Xin Li
25f0830ff1 Merge Android Pie into master
Bug: 112104996
Change-Id: Ibda46522d646c0a391c7d19663e4ffdb3d4b30fc
2018-08-06 16:52:51 -07:00
Jaegeuk Kim
b7b419541b Merge "secdiscard: should pin_file to avoid moving blocks in F2FS"
am: cb114c36d8

Change-Id: I3376ce6a9844d26c4e5658fc95477b8d6c9c0afe
2018-08-03 16:55:37 -07:00
Treehugger Robot
cb114c36d8 Merge "secdiscard: should pin_file to avoid moving blocks in F2FS" 2018-08-03 23:23:40 +00:00
Jaegeuk Kim
ab515b2011 secdiscard: should pin_file to avoid moving blocks in F2FS
This file should avoid F2FS GC, since it directly access block device based
on fibmap.

Bug: 111659036
Change-Id: I15aef8175c23ba4029eb580e2dba59c77cca8227
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
2018-08-02 14:17:17 -07:00
Stephen Hines
2abec98856 [automerger skipped] Merge "Use std::move() to prevent unnecessary copying. [DO NOT MERGE]"
am: 9b18b764bc  -s ours

Change-Id: I15fbe10ff91d910478dd67c93fbd9bff8f3fee36
2018-07-24 20:25:09 -07:00
Treehugger Robot
9b18b764bc Merge "Use std::move() to prevent unnecessary copying. [DO NOT MERGE]" 2018-07-25 03:15:21 +00:00
Stephen Hines
84eaf2f3b6 Use std::move() to prevent unnecessary copying. [DO NOT MERGE]
Bug: http://b/110779387
Test: Builds with new toolchain.
Change-Id: I735a3ecda11a662edaddbe21c36433a91bb8a7f1
2018-07-24 18:22:36 -07:00
Bowgo Tsai
3d4fb41f3d Merge "Do not unmount /mnt/product/* when vold starts"
am: 4a625453bf

Change-Id: Idd91865540106b5030f74b26037b61c00719ef28
2018-07-02 19:03:58 -07:00
Treehugger Robot
4a625453bf Merge "Do not unmount /mnt/product/* when vold starts" 2018-07-03 00:21:01 +00:00
Tri Vo
8d4da29312 [automerger skipped] Merge "Exclude /mnt/vendor from vold's ownership."
am: 4a634e3d8c  -s ours

Change-Id: I71402c01429c1cd6c16e10398a7d3c0853fb19a4
2018-06-29 09:57:13 -07:00
Treehugger Robot
4a634e3d8c Merge "Exclude /mnt/vendor from vold's ownership." 2018-06-29 16:47:11 +00:00
Bowgo Tsai
c0cd37be9d Do not unmount /mnt/product/* when vold starts
Bug: 110808288
Test: Boot a device and checks /mnt/product/foo mounted in early mount
      isn't unmounted.

Change-Id: Ide411cd78565505bc72ed57e79f3d31b6392b27c
2018-06-29 13:35:43 +08:00
Tri Vo
e98adee732 Exclude /mnt/vendor from vold's ownership.
Addresses this selinux denial:
avc: denied { search } for name="vendor" dev="tmpfs" ino=11069
scontext=u:r:vold:s0 tcontext=u:object_r:mnt_vendor_file:s0 tclass=dir
permissive=0

Bug: 64905218
Test: fixes above denial.
Change-Id: I670b2148e65c7e0fcabd1e11f5bace0c4f4e18bd
Merged-In: I670b2148e65c7e0fcabd1e11f5bace0c4f4e18bd
(cherry picked from commit bca5cd78fe)
2018-06-29 12:22:01 +08:00
Logan Chien
cc99436c66 [automerger skipped] Merge changes I1f9b7b13,I36bc4a44
am: 17a93d5001  -s ours

Change-Id: I94cd57d89e0c2091e7b9c645103b736e1e0e789a
2018-06-25 19:09:39 -07:00
Logan Chien
17a93d5001 Merge changes I1f9b7b13,I36bc4a44
* changes:
  Deprecate <cutils/log.h> and <utils/Log.h>
  Replace SLOG() with LOG(ERROR)
2018-06-26 02:04:17 +00:00
Logan Chien
7e0af8e480 Deprecate <cutils/log.h> and <utils/Log.h>
This commit replaces <cutils/log.h> and <utils/Log.h> with <log/log.h>.

Background:
<cutils/log.h> has been moved to <log/log.h> for a while.  Both
<cutils/log.h> and <utils/Log.h> simply includes <log/log.h> for
backward compatibility.  This commit is a part of the effort to remove
<cutils/log.h> and <utils/Log.h> from the source tree eventually.

Bug: 78370064
Test: lunch aosp_walleye-userdebug && cd system/vold && mma
Change-Id: I1f9b7b132f9c35469e97556a30b521cc47e829d7
Merged-In: I1f9b7b132f9c35469e97556a30b521cc47e829d7
2018-06-25 10:29:33 +08:00
Logan Chien
bf319c4e70 Replace SLOG() with LOG(ERROR)
This commit replaces SLOG() from cutils/log.h with LOG(ERROR) from
android-base/logging.h.

This commit is a partial cherry-pick of
3472e52fc2.

Test: mma  # it builds
Change-Id: I36bc4a4430fc16b2c1c2eb39a2ec4d888c1ae352
Merged-In: I70dc512f21459d1e25b187f24289002b2c7bc7af
2018-06-25 10:29:30 +08:00
Jeff Sharkey
c1e10dc348 Merge "Rely on updated newfs_msdos for parameter tuning."
am: 7d557e98be

Change-Id: I20d1a2c9dd402aa85d61c4cf3d765c487ca697f9
2018-06-19 16:34:37 -07:00
Treehugger Robot
7d557e98be Merge "Rely on updated newfs_msdos for parameter tuning." 2018-06-19 23:26:05 +00:00
Jeff Sharkey
a76f149f12 Rely on updated newfs_msdos for parameter tuning.
The recently updated newfs_msdos tool has robust tuning logic
internally to pick balanced values for parameters like sectors-per-
cluster, so rely on it instead of trying to force invalid
configurations.

If stakeholders want to tune these parameters even further, they
should contribute to upstream newfs_msdos, where it will benefit
more than just Android devices.

Bug: 29899852
Test: manual with 512MB, 2GB and 34GB devices
Change-Id: I23ab3699f37fc428c2bd7dcbd84f825412d916e6
2018-06-19 15:35:05 -06:00
Josh Gao
45175c437f Merge "Fix double close in GetTreeBytes."
am: 142702dc82

Change-Id: I1c9f259d4d372ef1a3c36a9f884e39b8003f7ff0
2018-06-08 17:17:56 -07:00
Treehugger Robot
142702dc82 Merge "Fix double close in GetTreeBytes." 2018-06-08 23:34:41 +00:00
Xin Li
12e0362fd8 Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
Bug: 79597307
Change-Id: I98ee147a69f0cd3bbcf9fc89acfdc467c91d2b8c
2018-06-08 11:09:27 -07:00
Luis Hector Chavez
cf5c9907f5 resolve merge conflicts of 7bf98aa8a0 to pi-dev-plus-aosp
BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I08252155f04e8b414f2149d8b29e5e2fff6bcc82
2018-06-05 10:10:08 -07:00
Luis Hector Chavez
7bf98aa8a0 Merge "vold: Avoid SIGSEGVs when fstab lacks /data"
am: e3017e0b18

Change-Id: Ib426ece8c295f58750de2526e9ca91c24791b731
2018-06-04 16:22:48 -07:00
Treehugger Robot
e3017e0b18 Merge "vold: Avoid SIGSEGVs when fstab lacks /data" 2018-06-04 20:49:41 +00:00
Luis Hector Chavez
bbb512d019 vold: Avoid SIGSEGVs when fstab lacks /data
This change adds null-checks for all the places where cryptfs tries to
access the /data entry in fstab, to avoid crashes.

Bug: 80493321
Test: No crashes in Android-in-Chrome OS (which lacks /data in fstab)
Change-Id: Id6cdfe01cdd336cebf8afb9bdd07135811115182
Merged-In: Id6cdfe01cdd336cebf8afb9bdd07135811115182
2018-06-04 19:12:17 +00:00
Jeff Sharkey
82208b730f [automerger skipped] Merge commit '635193ab36302e5f65e99c7df2f256cfd37068c7' into am-b7f1a67b-2024-4274-aa7d-e88e8cceb407 am: 9a35ab6a4f am: f707f1bb88 am: 2b9a343319 -s ours
am: 8e7c2624bb

Change-Id: Id3d4b780bab0e36da7d6bb3abf932c947a8fad86
2018-06-01 16:03:58 -07:00
Jeff Sharkey
8e7c2624bb [automerger skipped] Merge commit '635193ab36302e5f65e99c7df2f256cfd37068c7' into am-b7f1a67b-2024-4274-aa7d-e88e8cceb407 am: 9a35ab6a4f am: f707f1bb88
am: 2b9a343319  -s ours

Change-Id: Ibdcc6722750cfe7cb394a52d21de8e73ecdfd650
2018-06-01 15:57:36 -07:00
Jeff Sharkey
2b9a343319 Merge commit '635193ab36302e5f65e99c7df2f256cfd37068c7' into am-b7f1a67b-2024-4274-aa7d-e88e8cceb407 am: 9a35ab6a4f
am: f707f1bb88

Change-Id: I4d9e269f34cab043a7c437781187d9a47e0fa652
2018-06-01 15:31:32 -07:00
Jeff Sharkey
f707f1bb88 Merge commit '635193ab36302e5f65e99c7df2f256cfd37068c7' into am-b7f1a67b-2024-4274-aa7d-e88e8cceb407
am: 9a35ab6a4f

Change-Id: I273dc86e0b0580bef81e272a94043b269d7df402
2018-06-01 15:19:33 -07:00
Jeff Sharkey
9a35ab6a4f Merge commit '635193ab36302e5f65e99c7df2f256cfd37068c7' into am-b7f1a67b-2024-4274-aa7d-e88e8cceb407
* commit '635193ab36302e5f65e99c7df2f256cfd37068c7':
  Require quotes when searching for blkid keys.

Bug: 80436257
Test: manual
Change-Id: I4cbae2d594edefa10e5e2c5236d17fe3d37818cd
2018-06-01 16:03:06 -06:00
Android Build Merger (Role)
635193ab36 [automerger] Require quotes when searching for blkid keys. am: ee5c7318d7 am: 98bb129cd3 am: 0c5a0d65c9 am: 7e51f8d0c4 am: 53fe89bbad am: 5716ee6d7a am: 4de0e883d0 am: a7946bf9c6
Change-Id: I831bc503b1fdcf5a6a0c31ac0ded46d301c410ef
2018-06-01 21:46:12 +00:00