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

Revert: ksud, kernel: Pick some upstream changes and remove unused functions

Browse Source 
* Upstream commit:
f130f7572f

Signed-off-by: Faris <rsuntk@yukiprjkt.my.id>
This commit is contained in:
ShirkNeko
2025-10-22 00:09:56 +08:00
parent 253df1ea47
commit b5e5be2572
3 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
kernel/core_hook.c
View File

@@ -1007,6 +1007,9 @@ int ksu_handle_setuid(struct cred *new, const struct cred *old)
try_umount("/system_ext", true, 0); try_umount("/system_ext", true, 0);
try_umount("/data/adb/modules", false, MNT_DETACH); try_umount("/data/adb/modules", false, MNT_DETACH);
// try umount ksu temp path
try_umount("/debug_ramdisk", false, MNT_DETACH);
return 0; return 0;
} }

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

@@ -38,4 +38,5 @@ pub const KSU_BACKUP_DIR: &str = WORKING_DIR;
pub const KSU_BACKUP_FILE_PREFIX: &str = "ksu_backup_"; pub const KSU_BACKUP_FILE_PREFIX: &str = "ksu_backup_";
pub const BACKUP_FILENAME: &str = "stock_image.sha1"; pub const BACKUP_FILENAME: &str = "stock_image.sha1";
pub const NO_TMPFS_PATH: &str = concatcp!(WORKING_DIR, ".notmpfs");
pub const NO_MOUNT_PATH: &str = concatcp!(WORKING_DIR, ".nomount"); pub const NO_MOUNT_PATH: &str = concatcp!(WORKING_DIR, ".nomount");

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

@@ -2,7 +2,7 @@
use crate::kpm; use crate::kpm;
use crate::{ use crate::{
assets, defs, assets, defs,
defs::NO_MOUNT_PATH, defs::{KSU_MOUNT_SOURCE, NO_MOUNT_PATH, NO_TMPFS_PATH},
ksucalls, ksucalls,
module::{handle_updated_modules, prune_modules}, module::{handle_updated_modules, prune_modules},
restorecon, uid_scanner, utils, restorecon, uid_scanner, utils,
@@ -10,7 +10,7 @@ use crate::{
}; };
use anyhow::{Context, Result}; use anyhow::{Context, Result};
use log::{info, warn}; use log::{info, warn};
use rustix::mount::{MountFlags, mount}; use rustix::fs::{MountFlags, mount};
use std::path::Path; use std::path::Path;
#[cfg(target_os = "android")] #[cfg(target_os = "android")]
@@ -67,11 +67,11 @@ pub fn on_post_data_fs() -> Result<()> {
} }
if let Err(e) = prune_modules() { if let Err(e) = prune_modules() {
warn!("prune modules failed: {}", e); warn!("prune modules failed: {e}");
} }
if let Err(e) = handle_updated_modules() { if let Err(e) = handle_updated_modules() {
warn!("handle updated modules failed: {}", e); warn!("handle updated modules failed: {e}");
} }
if let Err(e) = restorecon::restorecon() { if let Err(e) = restorecon::restorecon() {
@@ -89,12 +89,31 @@ pub fn on_post_data_fs() -> Result<()> {
#[cfg(target_arch = "aarch64")] #[cfg(target_arch = "aarch64")]
if let Err(e) = kpm::start_kpm_watcher() { if let Err(e) = kpm::start_kpm_watcher() {
warn!("KPM: Failed to start KPM watcher: {}", e); warn!("KPM: Failed to start KPM watcher: {e}");
} }
#[cfg(target_arch = "aarch64")] #[cfg(target_arch = "aarch64")]
if let Err(e) = kpm::load_kpm_modules() { if let Err(e) = kpm::load_kpm_modules() {
warn!("KPM: Failed to load KPM modules: {}", e); warn!("KPM: Failed to load KPM modules: {e}");
}
let tmpfs_path = find_tmp_path();
// for compatibility
let no_mount = Path::new(NO_TMPFS_PATH).exists() || Path::new(NO_MOUNT_PATH).exists();
// mount temp dir
if !no_mount {
if let Err(e) = mount(
KSU_MOUNT_SOURCE,
&tmpfs_path,
"tmpfs",
MountFlags::empty(),
"",
) {
warn!("do temp dir mount failed: {e}");
}
} else {
info!("no tmpfs requested");
} }
// exec modules post-fs-data scripts // exec modules post-fs-data scripts
@@ -108,10 +127,9 @@ pub fn on_post_data_fs() -> Result<()> {
warn!("load system.prop failed: {e}"); warn!("load system.prop failed: {e}");
} }
let tmpfs_path = find_tmp_path();
// mount module systemlessly by magic mount // mount module systemlessly by magic mount
#[cfg(target_os = "android")] #[cfg(target_os = "android")]
if !Path::new(NO_MOUNT_PATH).exists() { if !no_mount {
if let Err(e) = crate::magic_mount::magic_mount(&tmpfs_path) { if let Err(e) = crate::magic_mount::magic_mount(&tmpfs_path) {
warn!("do systemless mount failed: {e}"); warn!("do systemless mount failed: {e}");
} }