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

ksud: Fix incorrect dependency

Browse Source
This commit is contained in:
tiann
2023-02-03 23:19:22 +08:00
parent aa73c34db2
commit 175de861bf
6 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
userspace/ksud/Cargo.toml
View File

@@ -32,7 +32,7 @@ rust-embed = { version = "6.4.2", features = [
"compression", # must clean build after updating binaries "compression", # must clean build after updating binaries
] } ] }
[target.'cfg(linux)'.dependencies] [target.'cfg(any(target_os = "android", target_os = "linux"))'.dependencies]
sys-mount = "2.0.1" sys-mount = "2.0.1"
# some android specific dependencies which compiles under unix are also listed here for convenience of coding # some android specific dependencies which compiles under unix are also listed here for convenience of coding
android-properties = { version = "0.2.2", features = ["bionic-deprecated"] } android-properties = { version = "0.2.2", features = ["bionic-deprecated"] }

8
userspace/ksud/src/ksu.rs
View File

@@ -20,7 +20,7 @@ pub const CMD_SET_SEPOLICY: u64 = 8;
const EVENT_POST_FS_DATA: u64 = 1; const EVENT_POST_FS_DATA: u64 = 1;
const EVENT_BOOT_COMPLETED: u64 = 2; const EVENT_BOOT_COMPLETED: u64 = 2;
#[cfg(target_os = "linux")] #[cfg(any(target_os = "linux", target_os = "android"))]
pub fn grant_root() -> Result<()> { pub fn grant_root() -> Result<()> {
let mut result: u32 = 0; let mut result: u32 = 0;
unsafe { unsafe {
@@ -38,14 +38,14 @@ pub fn grant_root() -> Result<()> {
Err(std::process::Command::new("sh").exec().into()) Err(std::process::Command::new("sh").exec().into())
} }
#[cfg(not(target_os = "linux"))] #[cfg(not(any(target_os = "linux", target_os = "android")))]
pub fn grant_root() -> Result<()> { pub fn grant_root() -> Result<()> {
unimplemented!("grant_root is only available on android"); unimplemented!("grant_root is only available on android");
} }
pub fn get_version() -> i32 { pub fn get_version() -> i32 {
let mut result: i32 = 0; let mut result: i32 = 0;
#[cfg(target_os = "linux")] #[cfg(any(target_os = "linux", target_os = "android"))]
unsafe { unsafe {
#[allow(clippy::cast_possible_wrap)] #[allow(clippy::cast_possible_wrap)]
libc::prctl( libc::prctl(
@@ -58,7 +58,7 @@ pub fn get_version() -> i32 {
} }
fn report_event(event: u64) { fn report_event(event: u64) {
#[cfg(target_os = "linux")] #[cfg(any(target_os = "linux", target_os = "android"))]
unsafe { unsafe {
#[allow(clippy::cast_possible_wrap)] #[allow(clippy::cast_possible_wrap)]
libc::prctl( libc::prctl(

30
userspace/ksud/src/mount.rs
View File

@@ -1,21 +1,21 @@
use anyhow::Result; use anyhow::Result;
#[cfg(target_os = "linux")] #[cfg(any(target_os = "linux", target_os = "android"))]
use anyhow::{Context, Ok}; use anyhow::{Context, Ok};
#[cfg(target_os = "linux")] #[cfg(any(target_os = "linux", target_os = "android"))]
use retry::delay::NoDelay; use retry::delay::NoDelay;
#[cfg(target_os = "linux")] #[cfg(any(target_os = "linux", target_os = "android"))]
use sys_mount::{unmount, FilesystemType, Mount, MountFlags, Unmount, UnmountFlags}; use sys_mount::{unmount, FilesystemType, Mount, MountFlags, Unmount, UnmountFlags};
pub struct AutoMountExt4 { pub struct AutoMountExt4 {
mnt: String, mnt: String,
#[cfg(target_os = "linux")] #[cfg(any(target_os = "linux", target_os = "android"))]
mount: Option<Mount>, mount: Option<Mount>,
auto_umount: bool, auto_umount: bool,
} }
impl AutoMountExt4 { impl AutoMountExt4 {
#[cfg(target_os = "linux")] #[cfg(any(target_os = "linux", target_os = "android"))]
pub fn try_new(src: &str, mnt: &str, auto_umount: bool) -> Result<Self> { pub fn try_new(src: &str, mnt: &str, auto_umount: bool) -> Result<Self> {
let result = Mount::builder() let result = Mount::builder()
.fstype(FilesystemType::from("ext4")) .fstype(FilesystemType::from("ext4"))
@@ -52,12 +52,12 @@ impl AutoMountExt4 {
} }
} }
#[cfg(not(target_os = "linux"))] #[cfg(not(any(target_os = "linux", target_os = "android")))]
pub fn try_new(_src: &str, _mnt: &str, _auto_umount: bool) -> Result<Self> { pub fn try_new(_src: &str, _mnt: &str, _auto_umount: bool) -> Result<Self> {
unimplemented!() unimplemented!()
} }
#[cfg(target_os = "linux")] #[cfg(any(target_os = "linux", target_os = "android"))]
pub fn umount(&self) -> Result<()> { pub fn umount(&self) -> Result<()> {
if let Some(ref mount) = self.mount { if let Some(ref mount) = self.mount {
mount mount
@@ -74,7 +74,7 @@ impl AutoMountExt4 {
} }
} }
#[cfg(target_os = "linux")] #[cfg(any(target_os = "linux", target_os = "android"))]
impl Drop for AutoMountExt4 { impl Drop for AutoMountExt4 {
fn drop(&mut self) { fn drop(&mut self) {
log::info!( log::info!(
@@ -89,7 +89,7 @@ impl Drop for AutoMountExt4 {
} }
#[allow(dead_code)] #[allow(dead_code)]
#[cfg(target_os = "linux")] #[cfg(any(target_os = "linux", target_os = "android"))]
fn mount_image(src: &str, target: &str, autodrop: bool) -> Result<()> { fn mount_image(src: &str, target: &str, autodrop: bool) -> Result<()> {
if autodrop { if autodrop {
Mount::builder() Mount::builder()
@@ -106,7 +106,7 @@ fn mount_image(src: &str, target: &str, autodrop: bool) -> Result<()> {
} }
#[allow(dead_code)] #[allow(dead_code)]
#[cfg(target_os = "linux")] #[cfg(any(target_os = "linux", target_os = "android"))]
pub fn mount_ext4(src: &str, target: &str, autodrop: bool) -> Result<()> { pub fn mount_ext4(src: &str, target: &str, autodrop: bool) -> Result<()> {
// umount target first. // umount target first.
let _ = umount_dir(target); let _ = umount_dir(target);
@@ -116,13 +116,13 @@ pub fn mount_ext4(src: &str, target: &str, autodrop: bool) -> Result<()> {
.map(|_| ()) .map(|_| ())
} }
#[cfg(target_os = "linux")] #[cfg(any(target_os = "linux", target_os = "android"))]
pub fn umount_dir(src: &str) -> Result<()> { pub fn umount_dir(src: &str) -> Result<()> {
unmount(src, UnmountFlags::empty()).with_context(|| format!("Failed to umount {src}"))?; unmount(src, UnmountFlags::empty()).with_context(|| format!("Failed to umount {src}"))?;
Ok(()) Ok(())
} }
#[cfg(target_os = "linux")] #[cfg(any(target_os = "linux", target_os = "android"))]
pub fn mount_overlay(lowerdir: &str, mnt: &str) -> Result<()> { pub fn mount_overlay(lowerdir: &str, mnt: &str) -> Result<()> {
Mount::builder() Mount::builder()
.fstype(FilesystemType::from("overlay")) .fstype(FilesystemType::from("overlay"))
@@ -133,17 +133,17 @@ pub fn mount_overlay(lowerdir: &str, mnt: &str) -> Result<()> {
.map_err(|e| anyhow::anyhow!("mount partition: {mnt} overlay failed: {e}")) .map_err(|e| anyhow::anyhow!("mount partition: {mnt} overlay failed: {e}"))
} }
#[cfg(not(target_os = "linux"))] #[cfg(not(any(target_os = "linux", target_os = "android")))]
pub fn mount_ext4(_src: &str, _target: &str, _autodrop: bool) -> Result<()> { pub fn mount_ext4(_src: &str, _target: &str, _autodrop: bool) -> Result<()> {
unimplemented!() unimplemented!()
} }
#[cfg(not(target_os = "linux"))] #[cfg(not(any(target_os = "linux", target_os = "android")))]
pub fn umount_dir(_src: &str) -> Result<()> { pub fn umount_dir(_src: &str) -> Result<()> {
unimplemented!() unimplemented!()
} }
#[cfg(not(target_os = "linux"))] #[cfg(not(any(target_os = "linux", target_os = "android")))]
pub fn mount_overlay(_lowerdir: &str, _mnt: &str) -> Result<()> { pub fn mount_overlay(_lowerdir: &str, _mnt: &str) -> Result<()> {
unimplemented!() unimplemented!()
} }

12
userspace/ksud/src/restorecon.rs
View File

@@ -2,9 +2,9 @@ use anyhow::Result;
use jwalk::{Parallelism::Serial, WalkDir}; use jwalk::{Parallelism::Serial, WalkDir};
use std::path::Path; use std::path::Path;
#[cfg(target_os = "linux")] #[cfg(any(target_os = "linux", target_os = "android"))]
use anyhow::{Context, Ok}; use anyhow::{Context, Ok};
#[cfg(target_os = "linux")] #[cfg(any(target_os = "linux", target_os = "android"))]
use extattr::{setxattr, Flags as XattrFlags}; use extattr::{setxattr, Flags as XattrFlags};
const SYSTEM_CON: &str = "u:object_r:system_file:s0"; const SYSTEM_CON: &str = "u:object_r:system_file:s0";
@@ -12,18 +12,18 @@ const _ADB_CON: &str = "u:object_r:adb_data_file:s0";
const SELINUX_XATTR : &str = "security.selinux"; const SELINUX_XATTR : &str = "security.selinux";
pub fn setcon<P: AsRef<Path>>(path: P, con: &str) -> Result<()> { pub fn setcon<P: AsRef<Path>>(path: P, con: &str) -> Result<()> {
#[cfg(target_os = "linux")] #[cfg(any(target_os = "linux", target_os = "android"))]
setxattr(&path, SELINUX_XATTR, con, XattrFlags::empty()) setxattr(&path, SELINUX_XATTR, con, XattrFlags::empty())
.with_context(|| format!("Failed to change SELinux context for {}", path.as_ref().display()))?; .with_context(|| format!("Failed to change SELinux context for {}", path.as_ref().display()))?;
Ok(()) Ok(())
} }
#[cfg(target_os = "linux")] #[cfg(any(target_os = "linux", target_os = "android"))]
pub fn setsyscon<P: AsRef<Path>>(path: P) -> Result<()> { pub fn setsyscon<P: AsRef<Path>>(path: P) -> Result<()> {
setcon(path, SYSTEM_CON) setcon(path, SYSTEM_CON)
} }
#[cfg(not(target_os = "linux"))] #[cfg(not(any(target_os = "linux", target_os = "android")))]
pub fn setsyscon<P: AsRef<Path>>(path: P) -> Result<()> { pub fn setsyscon<P: AsRef<Path>>(path: P) -> Result<()> {
unimplemented!() unimplemented!()
} }
@@ -31,7 +31,7 @@ pub fn setsyscon<P: AsRef<Path>>(path: P) -> Result<()> {
pub fn restore_syscon<P: AsRef<Path>>(dir: P) -> Result<()> { pub fn restore_syscon<P: AsRef<Path>>(dir: P) -> Result<()> {
for dir_entry in WalkDir::new(dir).parallelism(Serial) { for dir_entry in WalkDir::new(dir).parallelism(Serial) {
if let Some(path) = dir_entry.ok().map(|dir_entry| dir_entry.path()) { if let Some(path) = dir_entry.ok().map(|dir_entry| dir_entry.path()) {
#[cfg(target_os = "linux")] #[cfg(any(target_os = "linux", target_os = "android"))]
setxattr(&path, SELINUX_XATTR, SYSTEM_CON, XattrFlags::empty()).with_context( setxattr(&path, SELINUX_XATTR, SYSTEM_CON, XattrFlags::empty()).with_context(
|| format!("Failed to change SELinux context for {}", path.display()), || format!("Failed to change SELinux context for {}", path.display()),
)?; )?;

4
userspace/ksud/src/sepolicy.rs
View File

@@ -691,7 +691,7 @@ impl From<AtomicStatement> for FfiPolicy {
} }
} }
#[cfg(target_os = "linux")] #[cfg(any(target_os = "linux", target_os = "android"))]
fn apply_one_rule<'a>(statement: &'a PolicyStatement<'a>, strict: bool) -> Result<()> { fn apply_one_rule<'a>(statement: &'a PolicyStatement<'a>, strict: bool) -> Result<()> {
let policies: Vec<AtomicStatement> = statement.try_into()?; let policies: Vec<AtomicStatement> = statement.try_into()?;
@@ -720,7 +720,7 @@ fn apply_one_rule<'a>(statement: &'a PolicyStatement<'a>, strict: bool) -> Resul
Ok(()) Ok(())
} }
#[cfg(not(target_os = "linux"))] #[cfg(not(any(target_os = "linux", target_os = "android")))]
fn apply_one_rule<'a>(_statement: &'a PolicyStatement<'a>, _strict: bool) -> Result<()> { fn apply_one_rule<'a>(_statement: &'a PolicyStatement<'a>, _strict: bool) -> Result<()> {
unimplemented!() unimplemented!()
} }

4
userspace/ksud/src/utils.rs
View File

@@ -63,12 +63,12 @@ pub fn ensure_binary<T: AsRef<Path>>(path: T, contents: &[u8]) -> Result<()> {
Ok(()) Ok(())
} }
#[cfg(target_os = "linux")] #[cfg(any(target_os = "linux", target_os = "android"))]
pub fn getprop(prop: &str) -> Option<String> { pub fn getprop(prop: &str) -> Option<String> {
android_properties::getprop(prop).value() android_properties::getprop(prop).value()
} }
#[cfg(not(target_os = "linux"))] #[cfg(not(any(target_os = "linux", target_os = "android")))]
pub fn getprop(_prop: &str) -> Option<String> { pub fn getprop(_prop: &str) -> Option<String> {
unimplemented!() unimplemented!()
} }