br0kenpixel/ZygiskNext
1
0
Fork 0
mirror of https://github.com/Dr-TSNG/ZygiskNext.git synced 2025-08-27 23:46:34 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Better unmount refine

Browse Source
This commit is contained in:
Nullptr
2023-02-25 13:53:28 +08:00
parent 9ff1e27a7d
commit ec8475bca5
3 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
loader/src/injector/misc.cpp
View File

@@ -23,14 +23,13 @@ int parse_int(std::string_view s) {
return val; return val;
} }
void parse_mnt(const char* file, const std::function<bool(mntent*)>& fn) { void parse_mnt(const char* file, const std::function<void(mntent*)>& fn) {
auto fp = sFILE(setmntent(file, "re"), endmntent); auto fp = sFILE(setmntent(file, "re"), endmntent);
if (fp) { if (fp) {
mntent mentry{}; mntent mentry{};
char buf[PATH_MAX]; char buf[PATH_MAX];
while (getmntent_r(fp.get(), &mentry, buf, sizeof(buf))) { while (getmntent_r(fp.get(), &mentry, buf, sizeof(buf))) {
if (!fn(&mentry)) fn(&mentry);
break;
} }
} }
} }

2
loader/src/injector/misc.hpp
View File

@@ -126,7 +126,7 @@ struct StringCmp {
*/ */
int parse_int(std::string_view s); int parse_int(std::string_view s);
void parse_mnt(const char* file, const std::function<bool(mntent*)>& fn); void parse_mnt(const char* file, const std::function<void(mntent*)>& fn);
std::list<std::string> split_str(std::string_view s, std::string_view delimiter); std::list<std::string> split_str(std::string_view s, std::string_view delimiter);

19
loader/src/injector/unmount.cpp
View File

@@ -13,7 +13,7 @@ namespace {
if (umount2(mountpoint, MNT_DETACH) != -1) { if (umount2(mountpoint, MNT_DETACH) != -1) {
LOGD("Unmounted (%s)", mountpoint); LOGD("Unmounted (%s)", mountpoint);
} else { } else {
LOGW("Failed to unmount: %s (%s)", strerror(errno), mountpoint); PLOGE("Unmount (%s)", mountpoint);
} }
} }
} }
@@ -29,11 +29,18 @@ void revert_unmount() {
std::vector<std::string> targets; std::vector<std::string> targets;
std::list<std::pair<std::string, std::string>> backups; std::list<std::pair<std::string, std::string>> backups;
// Unmount ksu module dir last
targets.emplace_back(KSU_MODULE_DIR); targets.emplace_back(KSU_MODULE_DIR);
parse_mnt("/proc/self/mounts", [&](mntent* mentry) { parse_mnt("/proc/self/mounts", [&](mntent* mentry) {
if (mentry->mnt_dir == KSU_MODULE_DIR) { if (mentry->mnt_dir == KSU_MODULE_DIR) {
ksu_loop = mentry->mnt_fsname; ksu_loop = mentry->mnt_fsname;
return;
} }
// Unmount everything on /data/adb except ksu module dir
if (str_starts(mentry->mnt_dir, "/data/adb")) {
targets.emplace_back(mentry->mnt_dir);
}
// Unmount ksu overlays
if (mentry->mnt_type == "overlay"sv) { if (mentry->mnt_type == "overlay"sv) {
if (str_contains(mentry->mnt_opts, KSU_MODULE_DIR)) { if (str_contains(mentry->mnt_opts, KSU_MODULE_DIR)) {
targets.emplace_back(mentry->mnt_dir); targets.emplace_back(mentry->mnt_dir);
@@ -41,19 +48,20 @@ void revert_unmount() {
backups.emplace_back(mentry->mnt_dir, mentry->mnt_opts); backups.emplace_back(mentry->mnt_dir, mentry->mnt_opts);
} }
} }
return true;
}); });
// Unmount everything from ksu loop except ksu module dir
parse_mnt("/proc/self/mounts", [&](mntent* mentry) { parse_mnt("/proc/self/mounts", [&](mntent* mentry) {
if (mentry->mnt_fsname == ksu_loop) { if (mentry->mnt_fsname == ksu_loop && mentry->mnt_dir != KSU_MODULE_DIR) {
targets.emplace_back(mentry->mnt_dir); targets.emplace_back(mentry->mnt_dir);
} }
return true;
}); });
// Do unmount
for (auto& s: reversed(targets)) { for (auto& s: reversed(targets)) {
lazy_unmount(s.data()); lazy_unmount(s.data());
} }
// Affirm unmounted system overlays
parse_mnt("/proc/self/mounts", [&](mntent* mentry) { parse_mnt("/proc/self/mounts", [&](mntent* mentry) {
if (mentry->mnt_type == "overlay"sv) { if (mentry->mnt_type == "overlay"sv) {
backups.remove_if([&](auto& mnt) { backups.remove_if([&](auto& mnt) {
@@ -63,6 +71,7 @@ void revert_unmount() {
return true; return true;
}); });
// Restore system overlays
for (auto& mnt: backups) { for (auto& mnt: backups) {
auto opts = split_str(mnt.second, ","); auto opts = split_str(mnt.second, ",");
unsigned long flags = 0; unsigned long flags = 0;
@@ -76,7 +85,7 @@ void revert_unmount() {
if (mount("overlay", mnt.first.data(), "overlay", flags, mnt_data.data()) != -1) { if (mount("overlay", mnt.first.data(), "overlay", flags, mnt_data.data()) != -1) {
LOGD("Remounted (%s)", mnt.first.data()); LOGD("Remounted (%s)", mnt.first.data());
} else { } else {
LOGW("Failed to remount: %s (%s, %s)", strerror(errno), mnt.first.data(), mnt_data.data()); PLOGE("Remount (%s, %s)", mnt.first.data(), mnt_data.data());
} }
} }
} }