Commit graph

1728 commits

Author SHA1 Message Date
Treehugger Robot
7807866abe Merge "cryptfs: support make_f2fs with quota" 2017-11-14 01:06:37 +00:00
Jaegeuk Kim
b9a1169eca Merge "cryptfs: call format_f2fs correctly with proper flags" 2017-11-14 01:06:27 +00:00
Jaegeuk Kim
8de9f065a4 cryptfs: support make_f2fs with quota
Change-Id: I699b457ca0282c02e0d0a399c146d4e54a403bf4
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
2017-11-13 13:54:16 -08:00
Jaegeuk Kim
98651a235b cryptfs: call format_f2fs correctly with proper flags
Change-Id: Ia493e6f758ff5dd5dd41479193ab237d4306d464
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
2017-11-13 13:16:45 -08:00
Jeff Vander Stoep
c923127e23 Merge "Check that dir name is a pid before attempting to read"
am: 6419445383

Change-Id: I8b7639934bcee660bcd84f83afae5cc2c17bae15
2017-10-24 17:19:58 +00:00
Treehugger Robot
6419445383 Merge "Check that dir name is a pid before attempting to read" 2017-10-24 17:15:03 +00:00
Jeff Vander Stoep
a997db73d6 Check that dir name is a pid before attempting to read
Prevents selinux denials for folders in /proc that do not have the
default /proc label.

Bug: 68146208
Test: no selinux denials for vold attempting to read proc_asound dir.
Merged-In: I7cdd3bbe8e687e078372012773e9a34a5c76e0f8
Change-Id: I7cdd3bbe8e687e078372012773e9a34a5c76e0f8
2017-10-24 14:04:27 +00:00
Chih-hung Hsieh
7718457dfc Merge "Use -Werror in system/vold/tests"
am: d6d0e91c62

Change-Id: Idc41239ba5d67954dfb7d6e61e31768dafdd3599
2017-10-19 23:18:12 +00:00
Chih-hung Hsieh
d6d0e91c62 Merge "Use -Werror in system/vold/tests" 2017-10-19 22:33:52 +00:00
Chih-Hung Hsieh
27c0d952cb Use -Werror in system/vold/tests
Bug: 66996870
Test: build with WITH_TIDY=1
Change-Id: Ied1f6160124d10d81151d401ed4a0b089816abb3
2017-10-19 10:07:38 -07:00
TreeHugger Robot
db436c7999 Merge "Remove CheckBattery altogether" into stage-aosp-master 2017-10-04 05:22:11 +00:00
Paul Crowley
90a9c44f9d Merge "Remove CheckBattery altogether"
am: 2890b8d215  -s ours

Change-Id: I3ad2174feea5d62b9bcff2119032abd80254d77c
2017-10-04 04:39:22 +00:00
Paul Crowley
584610f325 Remove CheckBattery altogether
Test: changed Angler fstab to encryptable and encrypted.
Bug: 16868177
Change-Id: I17d36ea838d6d96f0752b2d6d03b1f9a781ed018
2017-10-03 21:38:15 -07:00
Treehugger Robot
2890b8d215 Merge "Remove CheckBattery altogether" 2017-10-03 23:19:02 +00:00
Paul Crowley
1b992e4f26 Remove CheckBattery altogether
Test: changed Angler fstab to encryptable and encrypted.
Bug: 16868177
Change-Id: I17d36ea838d6d96f0752b2d6d03b1f9a781ed018
2017-10-02 16:20:49 -07:00
Yifan Hong
2313818c46 Merge "vold: remove unnecessary dependency on libbatteryservice."
am: 7b0ac6d37e

Change-Id: I772e82a8ae54477014076be34b7dab5cb968fba7
2017-09-28 18:21:49 +00:00
Treehugger Robot
7b0ac6d37e Merge "vold: remove unnecessary dependency on libbatteryservice." 2017-09-28 18:14:42 +00:00
Yifan Hong
57838d665f vold: remove unnecessary dependency on libbatteryservice.
Battery check could be replaced by hwbinder calls into
android.hardware.health@2.0 instead, but because
of b/16868177, this is actually not needed.

Bug: 62229583
Test: pass
Change-Id: Ieb03e6ee2f648d9c1d85dbbdc10626726f5fe39b
2017-09-27 18:49:18 -07:00
Richard Uhler
6b264e4a4c Merge "Revert "Add support for gid derivation on private volumes""
am: 9588da7095

Change-Id: Ie2e32cca7542cdc1aaec5e8481b6a255b3c3b298
2017-09-22 17:24:03 +00:00
Treehugger Robot
9588da7095 Merge "Revert "Add support for gid derivation on private volumes"" 2017-09-22 17:21:55 +00:00
Richard Uhler
32a7b7fe82 Revert "Add support for gid derivation on private volumes"
This reverts commit 1b38e33003.

Causes a boot loop on bullhead.

(cherry picked from commit a3a60b372e)

Bug: 63245673
Bug: 65660058
Test: m
Merged-In: I9c8afd3ba22547aff5aff06b71cb8ff3b8a07350
Change-Id: I9c8afd3ba22547aff5aff06b71cb8ff3b8a07350
2017-09-22 09:04:05 -07:00
Daniel Rosenberg
c2c183e02c Merge "Add support for gid derivation on private volumes"
am: 0b7dbf0b1c

Change-Id: I55313f24f2d932fb76d1b107c9e765b507f0403d
2017-09-21 01:03:16 +00:00
Treehugger Robot
0b7dbf0b1c Merge "Add support for gid derivation on private volumes" 2017-09-21 00:57:48 +00:00
Daniel Rosenberg
4e8cec1fce Add support for gid derivation on private volumes
This sdcardfs feature was moved under a mount option
and is only needed on private volumes

Test: Private emulated volume should attempt to mount with
      derive_gid option.
Bug: 63245673
Change-Id: I40a8b15c298c815a4643007b9eca8269379fd2ac
2017-09-20 15:57:52 -07:00
Luis Hector Chavez
2aa4643dca Merge "Invert the order of SO_RCVBUFFORCE and SO_RCVBUFF"
am: a3258252ad

Change-Id: I92981e2eb069c4b01ac8d1be51abddb47602529c
2017-09-06 19:48:35 +00:00
Treehugger Robot
a3258252ad Merge "Invert the order of SO_RCVBUFFORCE and SO_RCVBUFF" 2017-09-06 19:32:03 +00:00
Josh Gao
da54114d23 Merge "Switch RebootType to an enum class."
am: db725d3348

Change-Id: I72431dc56d20cf1acb2443ae3d67300a59e10ad3
2017-08-29 21:47:58 +00:00
Treehugger Robot
db725d3348 Merge "Switch RebootType to an enum class." 2017-08-29 21:26:39 +00:00
Luis Hector Chavez
d1b00de2c1 Invert the order of SO_RCVBUFFORCE and SO_RCVBUFF
This change swaps the order of SO_RCVBUFFORCE and SO_RCVBUFF, because
the latter is silently capped to sysctl_rmem_max. So, just try
SO_RCVBUFF if the former failed.

Bug: 62417946
Test: Run android in a new user and network namespace, vold does not
      abort here.

Change-Id: Iac2ddae6fbb80ba84afe5414eade978cd795ef3c
2017-08-29 10:29:48 -07:00
Josh Gao
fec4437972 Switch RebootType to an enum class.
RebootType's shutdown enumerator collides with the shutdown socket
function, which causes problems when <sys/socket.h> gets included
transitively. Switch RebootType into an enum class, to namespace its
enumerators.

Test: treehugger
Change-Id: Ib5e8667df363acb28771430fd43000d381dc8620
2017-08-28 13:22:55 -07:00
Keun-young Park
23b87ecf41 Merge "mInternalEmulated could be used after shutdown() called" am: 9b4a443bd6 am: 92052aa582
am: 1b6d8237f2

Change-Id: I71b1ec275e2850c1a8273ac5eebc7373a0729552
2017-08-17 22:21:40 +00:00
Keun-young Park
1b6d8237f2 Merge "mInternalEmulated could be used after shutdown() called" am: 9b4a443bd6
am: 92052aa582

Change-Id: I7cd336807b1084bb52fcc2d973b2fd8efe5f54c7
2017-08-17 22:17:10 +00:00
Keun-young Park
92052aa582 Merge "mInternalEmulated could be used after shutdown() called"
am: 9b4a443bd6

Change-Id: Ia1007988297c39f391b35ad51645556ceeaf0cc6
2017-08-17 22:13:40 +00:00
Keun-young Park
9b4a443bd6 Merge "mInternalEmulated could be used after shutdown() called" 2017-08-17 22:10:24 +00:00
Gao Xiang
d263da8807 mInternalEmulated could be used after shutdown() called
It fixes the findvolume() / reset() use-after-free issue after
shutdown called to avoid vold crash.

Fixes: a5bbb5e3c1 ("make shutdown safe for double calls.")
Change-Id: I50f216141b20da08549080291091dc5690c00ffe
Signed-off-by: Gao Xiang <gaoxiang25@huawei.com>
2017-08-14 14:26:56 +08:00
Keun-young Park
4460d0e554 do not sleep if it is shutting down
am: 375ac25773

Change-Id: Id0aa75c190b7012f4d329533fcd664341ae8c26b
2017-08-03 18:28:14 +00:00
Keun-young Park
375ac25773 do not sleep if it is shutting down
- Various sleep(5) for vold shutdown can increase shutdown time a lot.
- If it is shutting down, do not sleep at all. init will take care of
  active partitions if not unmounted.

bug: 64143519
Test: reboot and check logs from vold, check if "ShutdownThread: Shutdown wait timed out" happens.
Change-Id: I7cb91427ad2205fe23a054d255caf7ffdfd9f6c3
2017-08-02 17:45:48 -07:00
Elliott Hughes
f14b2fdca9 Merge "Move off deprecated readdir_r." am: 1647759651 am: b60d874f24
am: 984b786b0e

Change-Id: Ida8d9a0830cf660155d50e5179d9199717ee1720
2017-08-02 17:27:29 +00:00
Elliott Hughes
984b786b0e Merge "Move off deprecated readdir_r." am: 1647759651
am: b60d874f24

Change-Id: Ic4370c02cf1d83281ffadedd9c2e1006d3748cf1
2017-08-02 17:22:55 +00:00
Elliott Hughes
b60d874f24 Merge "Move off deprecated readdir_r."
am: 1647759651

Change-Id: I4f5a6422eaef6be21d29f5ddc2b98ee53376e6a0
2017-08-02 17:19:01 +00:00
Elliott Hughes
1647759651 Merge "Move off deprecated readdir_r." 2017-08-02 17:12:21 +00:00
Elliott Hughes
4e3da6e96f Move off deprecated readdir_r.
Bug: http://b/32678321
Test: builds
Change-Id: I2d6e995d5eed3e72e12ce8b8f82a10143a256cd4
2017-08-01 17:39:44 -07:00
Junichi Uekawa
189527f13f Merge "Try SO_RCVBUF before SO_RCVBUFFORCE." am: 3f8fa0c215 am: dfcc7dbad0
am: 602a2ce0e0

Change-Id: I4d4946552edb444f4a3a7ea333f272a7408ec260
2017-07-13 20:37:17 +00:00
Junichi Uekawa
602a2ce0e0 Merge "Try SO_RCVBUF before SO_RCVBUFFORCE." am: 3f8fa0c215
am: dfcc7dbad0

Change-Id: I742ebc5174d809fa6f70324659f6e03798710679
2017-07-13 20:34:46 +00:00
Junichi Uekawa
dfcc7dbad0 Merge "Try SO_RCVBUF before SO_RCVBUFFORCE."
am: 3f8fa0c215

Change-Id: I5df611cfaa1c4451f4d0cd576f3b82f2fefbea6b
2017-07-13 20:32:18 +00:00
Treehugger Robot
3f8fa0c215 Merge "Try SO_RCVBUF before SO_RCVBUFFORCE." 2017-07-13 20:21:49 +00:00
Junichi Uekawa
c865adaa3b Try SO_RCVBUF before SO_RCVBUFFORCE.
When running in a container, the process might be in a user/net
namespace, which would cause setting the SO_RCVBUFFORCE socket option to
fail with EPERM. But rmem_max is set to a high enough value which allows
SO_RCVBUF to succeed.

Bug: 62417946
Test: Run android in a new user and network namespace, vold does not
      abort here.

Change-Id: I2b678ddd886a406a3394d9fdd33f9c8800ef78a3
Signed-off-by: Junichi Uekawa <uekawa@google.com>
(cherry picked from commit b41155d4af0e00fc6f65d7d67b80e7b866f847d6)
2017-07-11 15:51:54 -07:00
Keun-young Park
4f58be1b69 add vold to "shutdown critical"
am: 85f412b4ee

Change-Id: Ib346b39be455571656c4732d2ad63b3edbe1e0cd
2017-07-06 17:22:35 +00:00
Android Build Merger (Role)
f39281b68c Merge "Merge "add vold to "shutdown critical"" am: da85cb71b3 am: 228b95fa15 am: 733fe09928" into oc-dr1-dev-plus-aosp 2017-07-06 01:14:00 +00:00
Keun-young Park
681b90811c Merge "add vold to "shutdown critical"" am: da85cb71b3 am: 228b95fa15
am: 733fe09928

Change-Id: I123056823f31b7e8d0ad3a6ae7775867d3dd0edb
2017-07-06 01:13:30 +00:00