From d3c9b6e73953c555c9079b8538792cce3a323db4 Mon Sep 17 00:00:00 2001 From: ShirkNeko <109797057+ShirkNeko@users.noreply.github.com> Date: Thu, 26 Jun 2025 14:22:42 +0800 Subject: [PATCH] ksud: handle errors and non compatible ramdisk Co-authored-by: rifsxd --- userspace/ksud/src/boot_patch.rs | 55 ++++++++++++++++++-------------- 1 file changed, 31 insertions(+), 24 deletions(-) diff --git a/userspace/ksud/src/boot_patch.rs b/userspace/ksud/src/boot_patch.rs index 7f525544..98a66c70 100644 --- a/userspace/ksud/src/boot_patch.rs +++ b/userspace/ksud/src/boot_patch.rs @@ -167,14 +167,14 @@ fn do_cpio_cmd(magiskboot: &Path, workdir: &Path, cmd: &str) -> Result<()> { Ok(()) } -fn do_vendor_cpio_cmd(magiskboot: &Path, workdir: &Path, cmd: &str) -> Result<()> { - let vendor_ramdisk_cpio = workdir.join("vendor_ramdisk").join("init_boot.cpio"); +fn do_vendor_init_boot_cpio_cmd(magiskboot: &Path, workdir: &Path, cmd: &str) -> Result<()> { + let vendor_init_boot_cpio = workdir.join("vendor_ramdisk").join("init_boot.cpio"); let status = Command::new(magiskboot) .current_dir(workdir) .stdout(Stdio::null()) .stderr(Stdio::null()) .arg("cpio") - .arg(vendor_ramdisk_cpio) + .arg(vendor_init_boot_cpio) .arg(cmd) .status()?; @@ -194,15 +194,15 @@ fn is_magisk_patched(magiskboot: &Path, workdir: &Path) -> Result { Ok(status.code() == Some(1)) } -fn is_magisk_patched_vendor(magiskboot: &Path, workdir: &Path) -> Result { - let vendor_ramdisk_cpio = workdir.join("vendor_ramdisk").join("init_boot.cpio"); +fn is_magisk_patched_vendor_init_boot(magiskboot: &Path, workdir: &Path) -> Result { + let vendor_init_boot_cpio = workdir.join("vendor_ramdisk").join("init_boot.cpio"); let status = Command::new(magiskboot) .current_dir(workdir) .stdout(Stdio::null()) .stderr(Stdio::null()) .args([ "cpio", - vendor_ramdisk_cpio.to_str().unwrap(), + vendor_init_boot_cpio.to_str().unwrap(), "test", ]) .status()?; @@ -222,7 +222,7 @@ fn is_kernelsu_patched(magiskboot: &Path, workdir: &Path) -> Result { Ok(status.success()) } -fn is_kernelsu_patched_vendor(magiskboot: &Path, workdir: &Path) -> Result { +fn is_kernelsu_patched_vendor_init_boot(magiskboot: &Path, workdir: &Path) -> Result { let vendor_ramdisk_cpio = workdir.join("vendor_ramdisk").join("init_boot.cpio"); let status = Command::new(magiskboot) .current_dir(workdir) @@ -284,8 +284,8 @@ pub fn restore( let no_ramdisk = !workdir.join("ramdisk.cpio").exists(); let is_kernelsu_patched = is_kernelsu_patched(&magiskboot, workdir)?; - let is_kernelsu_patched_vendor = is_kernelsu_patched_vendor(&magiskboot, workdir)?; - ensure!(is_kernelsu_patched || is_kernelsu_patched_vendor, "boot image is not patched by KernelSU"); + let is_kernelsu_patched_vendor_init_boot = is_kernelsu_patched_vendor_init_boot(&magiskboot, workdir)?; + ensure!(is_kernelsu_patched || is_kernelsu_patched_vendor_init_boot, "boot image is not patched by KernelSU"); let mut new_boot = None; let mut from_backup = false; @@ -318,15 +318,15 @@ pub fn restore( if new_boot.is_none() { if no_ramdisk { - // vendor ramdisk restore - do_vendor_cpio_cmd(&magiskboot, workdir, "rm kernelsu.ko")?; + // vendor init_boot restore + do_vendor_init_boot_cpio_cmd(&magiskboot, workdir, "rm kernelsu.ko")?; // if init.real exists, restore it - let status = do_vendor_cpio_cmd(&magiskboot, workdir, "exists init.real").is_ok(); + let status = do_vendor_init_boot_cpio_cmd(&magiskboot, workdir, "exists init.real").is_ok(); if status { - do_vendor_cpio_cmd(&magiskboot, workdir, "mv init.real init")?; + do_vendor_init_boot_cpio_cmd(&magiskboot, workdir, "mv init.real init")?; } else { - let vendor_ramdisk = workdir.join("vendor_ramdisk").join("init_boot.cpio"); - std::fs::remove_file(vendor_ramdisk)?; + let vendor_init_boot = workdir.join("vendor_ramdisk").join("init_boot.cpio"); + std::fs::remove_file(vendor_init_boot )?; } } else { // remove kernelsu.ko @@ -516,24 +516,31 @@ fn do_patch( ensure!(status.success(), "magiskboot unpack failed"); let no_ramdisk = !workdir.join("ramdisk.cpio").exists(); + let no_vendor_init_boot = !workdir + .join("vendor_ramdisk") + .join("init_boot.cpio") + .exists();Add commentMore actions + if no_ramdisk && no_vendor_init_boot { + bail!("No compatible ramdisk found."); + } let is_magisk_patched = is_magisk_patched(&magiskboot, workdir)?; - let is_magisk_patched_vendor = is_magisk_patched_vendor(&magiskboot, workdir)?; + let is_magisk_patched_vendor_init_boot = is_magisk_patched_vendor_init_boot(&magiskboot, workdir)?; ensure!( - no_ramdisk || !is_magisk_patched || !is_magisk_patched_vendor, + !is_magisk_patched || !is_magisk_patched_vendor_init_boot, "Cannot work with Magisk patched image" ); println!("- Adding KernelSU LKM"); let is_kernelsu_patched = is_kernelsu_patched(&magiskboot, workdir)?; - let is_kernelsu_patched_vendor = is_kernelsu_patched_vendor(&magiskboot, workdir)?; + let is_kernelsu_patched_vendor_init_boot = is_kernelsu_patched_vendor_init_boot(&magiskboot, workdir)?; let mut need_backup = false; - if !is_kernelsu_patched || !is_kernelsu_patched_vendor { + if !is_kernelsu_patched || (no_ramdisk && !is_kernelsu_patched_vendor_init_boot) { if no_ramdisk { - // vendor ramdisk patching - let status = do_vendor_cpio_cmd(&magiskboot, workdir, "exists init"); + // vendor init_boot patching + let status = do_vendor_init_boot_cpio_cmd(&magiskboot, workdir, "exists init"); if status.is_ok() { - do_vendor_cpio_cmd(&magiskboot, workdir, "mv init init.real")?; + do_vendor_init_boot_cpio_cmd(&magiskboot, workdir, "mv init init.real")?; } } else { // kernelsu.ko is not exist, backup init if necessary @@ -546,8 +553,8 @@ fn do_patch( } if no_ramdisk { - do_vendor_cpio_cmd(&magiskboot, workdir, "add 0755 init init")?; - do_vendor_cpio_cmd(&magiskboot, workdir, "add 0755 kernelsu.ko kernelsu.ko")?; + do_vendor_init_boot_cpio_cmd(&magiskboot, workdir, "add 0755 init init")?; + do_vendor_init_boot_cpio_cmd(&magiskboot, workdir, "add 0755 kernelsu.ko kernelsu.ko")?; } else { do_cpio_cmd(&magiskboot, workdir, "add 0755 init init")?; do_cpio_cmd(&magiskboot, workdir, "add 0755 kernelsu.ko kernelsu.ko")?;