TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-04-03 05:05:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Consolidate get_module_fds implementation

Browse Source 
Close #8767
This commit is contained in:
topjohnwu 2025-02-12 02:55:18 +08:00
parent 8a80eea597
commit 442d5335ea
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
native/src/core/zygisk/daemon.rs
View File

@ -96,6 +96,10 @@ impl MagiskD {
module_list module_list
.iter() .iter()
.map(|m| if is_64_bit { m.z64 } else { m.z32 }) .map(|m| if is_64_bit { m.z64 } else { m.z32 })
// All fds passed over sockets have to be valid file descriptors.
// To work around this issue, send over STDOUT_FILENO as an indicator of an
// invalid fd as it will always be /dev/null in magiskd.
.map(|fd| if fd < 0 { STDOUT_FILENO } else { fd })
.collect() .collect()
}) })
} }
@ -166,15 +170,7 @@ impl MagiskD {
// Next send modules // Next send modules
if zygisk_should_load_module(flags) { if zygisk_should_load_module(flags) {
if let Some(module_list) = self.module_list.get() { if let Some(module_fds) = self.get_module_fds(is_64_bit) {
let module_fds: Vec<RawFd> = module_list
.iter()
.map(|m| if is_64_bit { m.z64 } else { m.z32 })
// All fds passed over sockets have to be valid file descriptors.
// To work around this issue, send over STDOUT_FILENO as an indicator of an
// invalid fd as it will always be /dev/null in magiskd.
.map(|fd| if fd < 0 { STDOUT_FILENO } else { fd })
.collect();
client.send_fds(&module_fds)?; client.send_fds(&module_fds)?;
} }
} }