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

Only kill apps with storage app data isolation enabled

Browse source 
Originally it kills all the apps with obb and data mounted.
Due to recent changes, all apps will have obb and data dirs mounted
in default root namespace. Hence all apps will be killed by
by KillProcessesWithMounts().

To fix this, we also check if the dir is mounted as tmpfs,
as the default namespace one is bind mounted to lowerfs,
which app data isolation is mounted as tmpfs, so we only
kill the process that have obb dir mounted as tmpfs.

Bug: 148049767
Test: Able to boot without warnings
Change-Id: I5f862ad6f64f5df739b68ea7c9815352bae3be5c
Merged-In: I45d9a63ed47cbc27aebb63357a43f51ad62275db
This commit is contained in:
Ricky Wai 2021-04-30 09:53:07 +01:00 committed by Alan Stokes
parent d2bb367549
commit 23356377ae
5 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Process.cpp
View file

@ -84,7 +84,7 @@ static bool checkSymlink(const std::string& path, const std::string& prefix) {
} }
// TODO: Refactor the code with KillProcessesWithOpenFiles(). // TODO: Refactor the code with KillProcessesWithOpenFiles().
int KillProcessesWithMounts(const std::string& prefix, int signal) { int KillProcessesWithTmpfsMounts(const std::string& prefix, int signal) {
std::unordered_set<pid_t> pids; std::unordered_set<pid_t> pids;
auto proc_d = std::unique_ptr<DIR, int (*)(DIR*)>(opendir("/proc"), closedir); auto proc_d = std::unique_ptr<DIR, int (*)(DIR*)>(opendir("/proc"), closedir);
@ -112,7 +112,8 @@ int KillProcessesWithMounts(const std::string& prefix, int signal) {
// Check if obb directory is mounted, and get all packages of mounted app data directory. // Check if obb directory is mounted, and get all packages of mounted app data directory.
mntent* mentry; mntent* mentry;
while ((mentry = getmntent(fp.get())) != nullptr) { while ((mentry = getmntent(fp.get())) != nullptr) {
if (android::base::StartsWith(mentry->mnt_dir, prefix)) { if (mentry->mnt_fsname != nullptr && strncmp(mentry->mnt_fsname, "tmpfs", 5) == 0
&& android::base::StartsWith(mentry->mnt_dir, prefix)) {
pids.insert(pid); pids.insert(pid);
break; break;
} }

2
Process.h
View file

@ -21,7 +21,7 @@ namespace android {
namespace vold { namespace vold {
int KillProcessesWithOpenFiles(const std::string& path, int signal, bool killFuseDaemon = true); int KillProcessesWithOpenFiles(const std::string& path, int signal, bool killFuseDaemon = true);
int KillProcessesWithMounts(const std::string& path, int signal); int KillProcessesWithTmpfsMounts(const std::string& path, int signal);
} // namespace vold } // namespace vold
} // namespace android } // namespace android

10
Utils.cpp
View file

@ -499,25 +499,25 @@ status_t ForceUnmount(const std::string& path) {
return -errno; return -errno;
} }
status_t KillProcessesWithMountPrefix(const std::string& path) { status_t KillProcessesWithTmpfsMountPrefix(const std::string& path) {
if (KillProcessesWithMounts(path, SIGINT) == 0) { if (KillProcessesWithTmpfsMounts(path, SIGINT) == 0) {
return OK; return OK;
} }
if (sSleepOnUnmount) sleep(5); if (sSleepOnUnmount) sleep(5);
if (KillProcessesWithMounts(path, SIGTERM) == 0) { if (KillProcessesWithTmpfsMounts(path, SIGTERM) == 0) {
return OK; return OK;
} }
if (sSleepOnUnmount) sleep(5); if (sSleepOnUnmount) sleep(5);
if (KillProcessesWithMounts(path, SIGKILL) == 0) { if (KillProcessesWithTmpfsMounts(path, SIGKILL) == 0) {
return OK; return OK;
} }
if (sSleepOnUnmount) sleep(5); if (sSleepOnUnmount) sleep(5);
// Send SIGKILL a second time to determine if we've // Send SIGKILL a second time to determine if we've
// actually killed everyone mount // actually killed everyone mount
if (KillProcessesWithMounts(path, SIGKILL) == 0) { if (KillProcessesWithTmpfsMounts(path, SIGKILL) == 0) {
return OK; return OK;
} }
PLOG(ERROR) << "Failed to kill processes using " << path; PLOG(ERROR) << "Failed to kill processes using " << path;

4
Utils.h
View file

@ -78,8 +78,8 @@ status_t ForceUnmount(const std::string& path);
/* Kills any processes using given path */ /* Kills any processes using given path */
status_t KillProcessesUsingPath(const std::string& path); status_t KillProcessesUsingPath(const std::string& path);
/* Kills any processes using given mount prifix */ /* Kills any processes using given tmpfs mount prifix */
status_t KillProcessesWithMountPrefix(const std::string& path); status_t KillProcessesWithTmpfsMountPrefix(const std::string& path);
/* Creates bind mount from source to target */ /* Creates bind mount from source to target */
status_t BindMount(const std::string& source, const std::string& target); status_t BindMount(const std::string& source, const std::string& target);

4
model/EmulatedVolume.cpp
View file

@ -191,7 +191,9 @@ status_t EmulatedVolume::unmountFuseBindMounts() {
// umount the whole Android/ dir. // umount the whole Android/ dir.
if (mAppDataIsolationEnabled) { if (mAppDataIsolationEnabled) {
std::string appObbDir(StringPrintf("%s/%d/Android/obb", getPath().c_str(), userId)); std::string appObbDir(StringPrintf("%s/%d/Android/obb", getPath().c_str(), userId));
KillProcessesWithMountPrefix(appObbDir); // Here we assume obb/data dirs is mounted as tmpfs, then it must be caused by
// app data isolation.
KillProcessesWithTmpfsMountPrefix(appObbDir);
} else { } else {
std::string androidDataTarget( std::string androidDataTarget(
StringPrintf("/mnt/user/%d/%s/%d/Android/data", userId, label.c_str(), userId)); StringPrintf("/mnt/user/%d/%s/%d/Android/data", userId, label.c_str(), userId));