br0kenpixel/Zygisk-Assistant
1
0
Fork 0
mirror of https://github.com/snake-4/Zygisk-Assistant.git synced 2025-09-06 06:37:02 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Improved unmount logic (#93)

Browse Source
This commit is contained in:
snake-4
2025-08-01 19:18:35 +02:00
committed by GitHub
parent 3ef02e5d28
commit 8832d695ac
1 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
module/jni/modules.cpp
View File

@@ -22,6 +22,7 @@
using namespace Parsers; using namespace Parsers;
static const std::set<std::string> mountdir_list = {"/data/adb", "/debug_ramdisk"};
static const std::set<std::string> fsname_list = {"KSU", "APatch", "magisk", "worker"}; static const std::set<std::string> fsname_list = {"KSU", "APatch", "magisk", "worker"};
static const std::unordered_map<std::string, int> mount_flags_procfs = { static const std::unordered_map<std::string, int> mount_flags_procfs = {
{"nosuid", MS_NOSUID}, {"nosuid", MS_NOSUID},
@@ -38,33 +39,32 @@ static bool shouldUnmount(const mountinfo_entry &mount, const mountinfo_root_res
const auto &mount_point = mount.getMountPoint(); const auto &mount_point = mount.getMountPoint();
const auto &type = mount.getFilesystemType(); const auto &type = mount.getFilesystemType();
// Mount is from /data/adb // Unmount all mounts from and to directories in mountdir_list
if (true_root.starts_with("/data/adb")) for (const auto &mountdir : mountdir_list)
return true; {
if (true_root.starts_with(mountdir) || mount_point.starts_with(mountdir))
return true;
// Mount is to /data/adb // Unmount all overlayfs with lowerdir/upperdir/workdir in mountdir_list
if (mount_point.starts_with("/data/adb")) if (type == "overlay")
return true; {
const auto &options = mount.getSuperOptions();
if (options.contains("lowerdir") && options.at("lowerdir").starts_with(mountdir))
return true;
if (options.contains("upperdir") && options.at("upperdir").starts_with(mountdir))
return true;
if (options.contains("workdir") && options.at("workdir").starts_with(mountdir))
return true;
}
}
// Unmount all module overlayfs and tmpfs // Unmount all module overlayfs and tmpfs
if ((type == "overlay" || type == "tmpfs") && fsname_list.contains(mount.getMountSource())) if ((type == "overlay" || type == "tmpfs") && fsname_list.contains(mount.getMountSource()))
return true; return true;
// Unmount all overlayfs with lowerdir/upperdir/workdir starting with /data/adb
if (type == "overlay")
{
const auto &options = mount.getSuperOptions();
if (options.contains("lowerdir") && options.at("lowerdir").starts_with("/data/adb"))
return true;
if (options.contains("upperdir") && options.at("upperdir").starts_with("/data/adb"))
return true;
if (options.contains("workdir") && options.at("workdir").starts_with("/data/adb"))
return true;
}
return false; return false;
} }