tequilaOS/platform_system_vold
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix vold wedge when unmounting Android/

Browse source 
In EmulatedVolume#doMount, if some operations fail, we call
EmulatedVolume#doUnmount.

During this unmount we try to unmount Android/ causing a FUSE_LOOKUP
on the FUSE mount. If the FUSE mount is not up, this can hang.

Now we introduce a new state to prevent unmounting Android/ if it
wasn't mounted.

Test: atest AdoptableHostTest
Bug: 151685786
Change-Id: I6246d3910c352034d2a4fb09ad9c1e7fd91cba5e
This commit is contained in:
Zim 2020-03-17 15:15:42 +00:00
parent 6b12257702
commit b6488f3f04
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
model/EmulatedVolume.cpp
View file

@ -48,6 +48,7 @@ EmulatedVolume::EmulatedVolume(const std::string& rawPath, int userId)
mRawPath = rawPath;
mLabel = "emulated";
mFuseMounted = false;
mAndroidMounted = false;
mUseSdcardFs = IsFilesystemSupported("sdcardfs");
mAppDataIsolationEnabled = base::GetBoolProperty(kVoldAppDataIsolationEnabled, false);
}
@ -59,6 +60,7 @@ EmulatedVolume::EmulatedVolume(const std::string& rawPath, dev_t device, const s
mRawPath = rawPath;
mLabel = fsUuid;
mFuseMounted = false;
mAndroidMounted = false;
mUseSdcardFs = IsFilesystemSupported("sdcardfs");
mAppDataIsolationEnabled = base::GetBoolProperty(kVoldAppDataIsolationEnabled, false);
}
@ -87,6 +89,8 @@ static status_t doFuseBindMount(const std::string& source, const std::string& ta
}
status_t EmulatedVolume::mountFuseBindMounts() {
CHECK(!mAndroidMounted);
std::string androidSource;
std::string label = getLabel();
int userId = getMountUserId();
@ -109,6 +113,8 @@ status_t EmulatedVolume::mountFuseBindMounts() {
if (status != OK) {
return status;
}
mAndroidMounted = true;
// Installers get the same view as all other apps, with the sole exception that the
// OBB dirs (Android/obb) are writable to them. On sdcardfs devices, this requires
// a special bind mount, since app-private and OBB dirs share the same GID, but we
@ -129,6 +135,8 @@ status_t EmulatedVolume::mountFuseBindMounts() {
}
status_t EmulatedVolume::unmountFuseBindMounts() {
CHECK(mAndroidMounted);
std::string label = getLabel();
int userId = getMountUserId();
@ -158,7 +166,6 @@ status_t EmulatedVolume::unmountFuseBindMounts() {
}
LOG(INFO) << "Unmounted " << androidTarget;
}
return OK;
}
@ -297,7 +304,10 @@ status_t EmulatedVolume::doUnmount() {
// Ignoring unmount return status because we do want to try to unmount
// the rest cleanly.
unmountFuseBindMounts();
if (mAndroidMounted) {
unmountFuseBindMounts();
mAndroidMounted = false;
}
if (UnmountUserFuse(userId, getInternalPath(), label) != OK) {
PLOG(INFO) << "UnmountUserFuse failed on emulated fuse volume";
return -errno;

3
model/EmulatedVolume.h
View file

@ -63,6 +63,9 @@ class EmulatedVolume : public VolumeBase {
/* Whether we mounted FUSE for this volume */
bool mFuseMounted;
/* Whether we mounted Android/ for this volume */
bool mAndroidMounted;
/* Whether to use sdcardfs for this volume */
bool mUseSdcardFs;