android/SukiSU-Ultra
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

ksud: refine tmpfs

Browse Source
This commit is contained in:
5ec1cff
2024-11-29 12:28:55 +08:00
parent c6f5b85f49
commit ffa571e950
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
userspace/ksud/src/defs.rs
View File

@@ -31,6 +31,7 @@ pub const DISABLE_FILE_NAME: &str = "disable";
pub const UPDATE_FILE_NAME: &str = "update"; pub const UPDATE_FILE_NAME: &str = "update";
pub const REMOVE_FILE_NAME: &str = "remove"; pub const REMOVE_FILE_NAME: &str = "remove";
pub const SKIP_MOUNT_FILE_NAME: &str = "skip_mount"; pub const SKIP_MOUNT_FILE_NAME: &str = "skip_mount";
pub const MAGIC_MOUNT_WORK_DIR: &str = concatcp!(TEMP_DIR, "/workdir");
pub const VERSION_CODE: &str = include_str!(concat!(env!("OUT_DIR"), "/VERSION_CODE")); pub const VERSION_CODE: &str = include_str!(concat!(env!("OUT_DIR"), "/VERSION_CODE"));
pub const VERSION_NAME: &str = include_str!(concat!(env!("OUT_DIR"), "/VERSION_NAME")); pub const VERSION_NAME: &str = include_str!(concat!(env!("OUT_DIR"), "/VERSION_NAME"));

7
userspace/ksud/src/init_event.rs
View File

@@ -1,7 +1,9 @@
use crate::defs::{KSU_MOUNT_SOURCE, TEMP_DIR};
use crate::module::{handle_updated_modules, prune_modules}; use crate::module::{handle_updated_modules, prune_modules};
use crate::{assets, defs, ksucalls, restorecon, utils}; use crate::{assets, defs, ksucalls, restorecon, utils};
use anyhow::{Context, Result}; use anyhow::{Context, Result};
use log::{info, warn}; use log::{info, warn};
use rustix::fs::{mount, MountFlags};
use std::path::Path; use std::path::Path;
pub fn on_post_data_fs() -> Result<()> { pub fn on_post_data_fs() -> Result<()> {
@@ -65,6 +67,11 @@ pub fn on_post_data_fs() -> Result<()> {
warn!("apply root profile sepolicy failed: {}", e); warn!("apply root profile sepolicy failed: {}", e);
} }
// mount temp dir
if let Err(e) = mount(KSU_MOUNT_SOURCE, TEMP_DIR, "tmpfs", MountFlags::empty(), "") {
warn!("do temp dir mount failed: {}", e);
}
// exec modules post-fs-data scripts // exec modules post-fs-data scripts
// TODO: Add timeout // TODO: Add timeout
if let Err(e) = crate::module::exec_stage_script("post-fs-data", true) { if let Err(e) = crate::module::exec_stage_script("post-fs-data", true) {

7
userspace/ksud/src/magic_mount.rs
View File

@@ -1,8 +1,9 @@
use crate::defs::{ use crate::defs::{
DISABLE_FILE_NAME, KSU_MOUNT_SOURCE, MODULE_DIR, SKIP_MOUNT_FILE_NAME, TEMP_DIR, DISABLE_FILE_NAME, KSU_MOUNT_SOURCE, MAGIC_MOUNT_WORK_DIR, MODULE_DIR, SKIP_MOUNT_FILE_NAME,
}; };
use crate::magic_mount::NodeFileType::{Directory, RegularFile, Symlink, Whiteout}; use crate::magic_mount::NodeFileType::{Directory, RegularFile, Symlink, Whiteout};
use crate::restorecon::{lgetfilecon, lsetfilecon}; use crate::restorecon::{lgetfilecon, lsetfilecon};
use crate::utils::ensure_dir_exists;
use anyhow::{bail, Context, Result}; use anyhow::{bail, Context, Result};
use extattr::lgetxattr; use extattr::lgetxattr;
use rustix::fs::{ use rustix::fs::{
@@ -416,13 +417,15 @@ fn do_magic_mount<P: AsRef<Path>, WP: AsRef<Path>>(
pub fn magic_mount() -> Result<()> { pub fn magic_mount() -> Result<()> {
if let Some(root) = collect_module_files()? { if let Some(root) = collect_module_files()? {
log::debug!("collected: {:#?}", root); log::debug!("collected: {:#?}", root);
let tmp_dir = PathBuf::from(TEMP_DIR); let tmp_dir = PathBuf::from(MAGIC_MOUNT_WORK_DIR);
ensure_dir_exists(&tmp_dir)?;
mount(KSU_MOUNT_SOURCE, &tmp_dir, "tmpfs", MountFlags::empty(), "").context("mount tmp")?; mount(KSU_MOUNT_SOURCE, &tmp_dir, "tmpfs", MountFlags::empty(), "").context("mount tmp")?;
mount_change(&tmp_dir, MountPropagationFlags::PRIVATE).context("make tmp private")?; mount_change(&tmp_dir, MountPropagationFlags::PRIVATE).context("make tmp private")?;
let result = do_magic_mount("/", &tmp_dir, root, false); let result = do_magic_mount("/", &tmp_dir, root, false);
if let Err(e) = unmount(&tmp_dir, UnmountFlags::DETACH) { if let Err(e) = unmount(&tmp_dir, UnmountFlags::DETACH) {
log::error!("failed to unmount tmp {}", e); log::error!("failed to unmount tmp {}", e);
} }
fs::remove_dir(tmp_dir).ok();
result result
} else { } else {
log::info!("no modules to mount, skipping!"); log::info!("no modules to mount, skipping!");