topjohnwu
c7083659aa
Directly guard boot state with mutex
2023-11-27 17:40:58 +08:00
canyie
68442f38ac
Misc changes
...
- actions: Update all actions/checkout references to v4
- magiskboot: Add missing new line to dtb help message
- docs: Update documents, fix some errors and remove outdated info
2023-11-17 13:58:41 -08:00
topjohnwu
8d5b9e5329
C++/Rust 2 way binding for MagiskD
2023-11-17 13:35:50 -08:00
topjohnwu
6c0966b795
Move some global state into Rust
2023-11-16 15:38:38 -08:00
topjohnwu
7c2e93d266
Introduce owned_fd
2023-11-16 15:38:38 -08:00
topjohnwu
49f241b77c
Allow running scripts with incomplete env
2023-11-10 00:55:05 -08:00
topjohnwu
cfb20b0f86
Zygisk refactoring part 2
2023-11-09 20:55:58 -08:00
topjohnwu
6d6f14fcb3
Use bitflags
2023-11-09 14:35:49 -08:00
topjohnwu
977c981265
Make sure native bridge is restored on daemon restart
2023-11-08 17:55:25 -08:00
topjohnwu
ef48abf19d
Reorganize zygisk code
2023-11-08 17:46:39 -08:00
topjohnwu
65c18f9c09
Restructure project files
2023-11-08 01:46:02 -08:00
残页
ecb31eed40
Prevent Zygisk from closing new fds created by Zygote itself
2023-11-08 00:34:38 -08:00
topjohnwu
a80cadf587
Refactor hookJniNativeMethods
...
Utilize NativeBridgeRuntimeCallbacks we obtained from native bridge
to directly fetch and modify registered native JNI methods.
By doing so, we do not need to keep a copy of every single
JNINativeMethod registered in order to provide JNI hooking
functionality.
Co-authored-by: LoveSy <shana@zju.edu.cn>
2023-11-07 23:57:55 -08:00
LoveSy
fce1bf2365
Obtain NativeBridgeRuntimeCallbacks for future use
...
NativeBridgeRuntimeCallbacks can be used for better JNI method hooking
Co-authored-by: topjohnwu <topjohnwu@gmail.com>
2023-11-07 16:56:40 -08:00
LoveSy
cbc6d40b2c
Clean up codes
2023-11-07 14:25:57 -08:00
LoveSy
9fbd079560
Refactor zygisk to use native bridge to inject
...
Co-authored-by: vvb2060 <vvb2060@gmail.com>
Co-authored-by: topjohnwu <topjohnwu@gmail.com>
2023-11-07 14:25:57 -08:00
LoveSy
42eb928054
Inject zygisk.rc for sync --zygisk-restart
2023-11-06 15:39:48 -08:00
topjohnwu
75e37be6f3
Do not need to check pkg in magisk_env
2023-11-05 23:02:40 -08:00
topjohnwu
ac5ceb18c8
Guard log FIFO with SELinux
2023-11-04 23:59:11 -07:00
topjohnwu
72b39594d3
Always close logd_fd during fork
2023-11-04 02:36:14 -07:00
topjohnwu
16ae4aedf1
Remove usage of MAGISKTMP
2023-11-02 15:50:36 -07:00
topjohnwu
489100c755
Fix fd sanitization
2023-11-01 02:01:29 -07:00
topjohnwu
da766f2a4e
Do not go through magiskd for getting the log pipe
2023-11-01 02:01:18 -07:00
topjohnwu
c81d7ff76c
Remove unnecessary RefCell usage
2023-10-31 18:22:48 -07:00
topjohnwu
a6e50d3648
Make log pipe a FIFO instead of anonymous pipe
2023-10-31 18:05:22 -07:00
topjohnwu
a177846044
Better logging in recv_fds
2023-10-31 17:40:59 -07:00
topjohnwu
19a4e11645
Make tmpfs path static strings
2023-10-29 00:47:28 -07:00
topjohnwu
67cc36268e
Simplify zygisk log pipe
2023-10-26 18:13:56 -07:00
LoveSy
9088b584f6
Use official argh
2023-10-25 15:14:16 -07:00
topjohnwu
985454afd4
Better logging
2023-10-24 16:41:49 -07:00
topjohnwu
1eeb2a34a1
Don't support alternative binary paths
...
The Magisk app will guide users through repair setup
2023-10-19 05:11:43 -07:00
topjohnwu
91c92051f1
Simplify C++ SELinux routines
2023-10-17 16:04:59 -07:00
topjohnwu
4b8a0388e7
Make SELinux support a feature
2023-10-17 13:29:15 -07:00
topjohnwu
66788dc58c
Cleanup SELinux support
2023-10-16 17:38:44 -07:00
topjohnwu
36de62873a
Fix error logging on the C++ side
2023-10-13 16:59:54 -07:00
topjohnwu
51e37880c6
Add repr(transparent) to guarantee soundness
2023-10-12 18:59:16 -07:00
topjohnwu
4b83c1e76c
Cleanup messy error messages
2023-10-12 18:54:09 -07:00
topjohnwu
6d1e8d86cb
Cleaner cstr code
2023-10-11 23:53:55 -07:00
topjohnwu
eda8c70a80
Borrow value instead of moving in FsPath::from()
...
When accepting a value of AsRef<Utf8CStr> in FsPath::from(), the
existing code will move a value of Utf8CStrBufArr, creating a reference
that lives longer than the borrowing value, causing undefined behavior.
The issue is only visible on release builds, as more advanced
optimizations will be more aggressive re-using the stack of variables
that no longer lives.
Fix #7408
2023-10-11 23:48:54 -07:00
topjohnwu
e774408782
Allow AVD hacks on release builds
2023-10-11 14:17:31 -07:00
topjohnwu
6076b52c48
Update libcxx
2023-10-03 17:22:25 -07:00
topjohnwu
79a1c39b30
Simplify fd sanitization
2023-09-28 20:38:16 -07:00
topjohnwu
5c92d39498
Enable Zygisk by default in emulators
...
Make sure CI tests Zygisk
2023-09-28 20:25:26 -07:00
topjohnwu
6e7a995716
Introduce UtfCString
2023-09-27 15:21:24 -07:00
topjohnwu
a55d570213
Move more I/O operations into Rust
2023-09-27 02:28:43 -07:00
topjohnwu
5d07d0b964
Do not support systems without SELinux
2023-09-27 02:28:43 -07:00
Wang Han
ec115cd7e3
Don't skip fd sanitization if fds_to_ignore does not exist
2023-09-25 09:45:03 -07:00
topjohnwu
a3f5918d25
Fix bug in libsepol
...
Fix #7308
2023-09-23 22:34:51 -07:00
topjohnwu
b28326198c
Use crates for cpio code
2023-09-22 01:39:21 -07:00
topjohnwu
46275b90c2
Generalize unxz
2023-09-21 05:47:21 -07:00
topjohnwu
15e13a8d8b
Organize logging code
2023-09-19 03:02:30 -07:00
topjohnwu
b750c89c87
Address clippy warnings
2023-09-19 01:11:50 -07:00
LoveSy
8d7c7c3dfb
Refactor dtb in rust
2023-09-19 00:41:42 -07:00
topjohnwu
8e1a91509c
Remove readlink_unsafe
2023-09-19 00:06:21 -07:00
LoveSy
927cd571f8
Fix read_cert
crash when receive fd = -1
2023-09-18 22:32:32 -07:00
LoveSy
5fbd3e5c65
Fix buf len update of read_link to Utf8CStrBuf
2023-09-18 22:31:12 -07:00
topjohnwu
dda8cc85c9
Use bytemuck
2023-09-14 13:10:09 -07:00
topjohnwu
6a59939d9a
Remove for_all_file
2023-09-13 18:09:16 -07:00
topjohnwu
9aa466c773
Fix genfscon and filename_trans
...
Fix #7329
2023-09-12 21:31:31 -07:00
LoveSy
0243610c09
No trailing zeros if the signed boot img is larger
2023-09-12 18:09:20 -07:00
topjohnwu
0a2a590ab7
Use Utf8CStr for logging
2023-09-12 17:35:20 -07:00
topjohnwu
89aee6ffa7
Add more to the Utf8CStr family
...
Better C strings with path operations
2023-09-12 17:35:01 -07:00
topjohnwu
4eaf701cb7
Address clippy warnings
2023-09-06 21:45:12 -07:00
topjohnwu
4fff2aa7d8
Fix proto read and write
2023-09-06 20:45:59 -07:00
topjohnwu
35b3c8ba5c
Cleanup persist props code
2023-09-06 15:52:14 -07:00
topjohnwu
1d7cff7703
Update Cargo dependencies
2023-09-06 13:57:43 -07:00
LoveSy
8d81bd0e33
resetprop: replace nanopb with quick-protobuf for persist
2023-09-05 22:20:57 -07:00
topjohnwu
4c45775131
Update BusyBox
2023-09-02 05:45:18 -07:00
LoveSy
c072b4254d
Wrap rename and renameat
2023-09-02 04:24:24 -07:00
topjohnwu
2dbb812126
Disable stack protector on x86 static executables
...
Close #7274
2023-09-01 23:04:19 -07:00
topjohnwu
0c28a916be
Use cxx_name
2023-08-24 00:50:38 -07:00
topjohnwu
275208e81b
Update Rust dependencies
2023-08-17 21:24:29 -07:00
topjohnwu
41226c12b8
Update to ONDK r25.7
2023-08-15 17:10:20 -07:00
topjohnwu
b5b14ce343
Use cxx_name instead of rust_name
2023-08-10 21:22:53 -07:00
topjohnwu
f924ffcbf3
Merge files
2023-08-08 00:57:58 -07:00
vvb2060
c6efb51f61
sulog: add more info
2023-08-02 21:18:05 -07:00
topjohnwu
17ba5cba3e
Print permissive rules
2023-08-02 09:11:22 -07:00
topjohnwu
f2e109ad7d
Update libselinux and libsepol
2023-08-01 18:07:53 -07:00
topjohnwu
c83e141a1c
Support dumping sepolicy rules
2023-08-01 18:03:54 -07:00
topjohnwu
6089cc36de
Update xperm parsing
2023-07-31 09:28:27 -07:00
topjohnwu
9638dc0a66
Fix perror
2023-07-25 21:03:04 -07:00
Andrew Gunnerson
b191a14a23
magiskpolicy: Fix old xperms being cleared when adding new xperms
...
This commit updates sepol_impl::add_xperm_rule() so that it loads the
current xperm bits from the existing avtab entry before setting or
clearing xperm bits. This fixes new allowxperm rules causing old xperm
rules within the same xperm specified/driver to be removed.
Fixes : #7176
Signed-off-by: Andrew Gunnerson <accounts+github@chiller3.com>
2023-07-24 23:52:28 -07:00
topjohnwu
7ad77a14ae
Remove unused line
2023-07-17 21:43:09 -07:00
topjohnwu
af65d07456
Support AVB1.0 signing and verification in magiskboot
2023-07-17 18:57:50 -07:00
topjohnwu
c97ab690b6
Segment memory mapped boot image region
2023-07-13 21:01:49 -07:00
LoveSy
0a07018fec
No need to use submodule for argh
2023-07-06 15:28:39 -07:00
LoveSy
64c82e1f2c
Refine cpio argh
...
we can use argh to handle `--help` now
2023-07-06 15:07:06 -07:00
topjohnwu
e8e8afa6c2
Properly handle visibility
2023-07-06 11:12:27 -07:00
LoveSy
af2207433d
Fix error logging
...
ok_or will unconditionally creates a LoggedResult, which prints
an error even it successes. Use ok_or_else which lazily creates
a LoggedResult only if it fails.
2023-07-06 11:01:57 -07:00
LoveSy
606d97ae4d
Trace location from LoggedError
...
Co-authored-by: topjohnwu <topjohnwu@gmail.com>
2023-07-05 18:55:23 -07:00
topjohnwu
d778b0b0a7
Custom help message when using argh
...
Help messages generated from argh is nearly useless and very hard to
customize. Fork argh and disable all code for generating help messages.
Use a closure to print the help message when handling EarlyExit.
2023-07-05 17:05:39 -07:00
topjohnwu
5ee6daf126
Handle cpio commands properly
2023-07-03 21:57:28 -07:00
topjohnwu
ee943afbc9
Cleanup SHA hash implementation
2023-06-30 15:50:52 -07:00
LoveSy
1f7c3e9f14
Use rust to calculate sha
2023-06-30 14:06:02 -07:00
LoveSy
a470ee6f93
Fix mmap block device
2023-06-30 01:06:51 -07:00
topjohnwu
4ee4cbada6
Standardize logging and error handling
...
- Introduce new types: LoggedResult and LoggedError
- Introduce new extension methods to log and add additional msgs
- Never exit when logging error messages in Rust (all errors should be
handled by using Result and Rust's error propagation)
- Remove all usages of anyhow as it doesn't fit Magisk's use cases
2023-06-29 17:14:53 -07:00
topjohnwu
a8c4a33e91
Avoid using trait object
2023-06-23 02:32:29 -07:00
topjohnwu
279f955a84
Minor changes
2023-06-23 01:50:33 -07:00
topjohnwu
dc26ad7125
Address clippy warnings
2023-06-22 02:36:31 -07:00
LoveSy
24b1c607f3
Replace clap with argh
2023-06-22 02:36:31 -07:00