TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-12-25 21:07:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sanitize /proc/PID/environ

Browse Source
This commit is contained in:
topjohnwu 2021-01-06 23:41:37 -08:00
parent 4060c2107c
commit 2a257f327c
1 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
native/jni/inject/entry.cpp
View File

@ -2,6 +2,7 @@
#include <dlfcn.h> #include <dlfcn.h>
#include <sys/mount.h> #include <sys/mount.h>
#include <sys/sendfile.h> #include <sys/sendfile.h>
#include <sys/prctl.h>
#include <android/log.h> #include <android/log.h>
#include <atomic> #include <atomic>
@ -60,6 +61,25 @@ static void *unload_first_stage(void *) {
return nullptr; return nullptr;
} }
// Make sure /proc/self/environ does not reveal our secrets
// Copy all env to a contiguous memory and set the memory region as MM_ENV
static void sanitize_environ() {
static string env;
for (int i = 0; environ[i]; ++i) {
env += environ[i];
env += '\0';
}
for (int i = 0; i < 2; ++i) {
bool success = true;
success &= (0 <= prctl(PR_SET_MM, PR_SET_MM_ENV_START, env.data(), 0, 0));
success &= (0 <= prctl(PR_SET_MM, PR_SET_MM_ENV_END, env.data() + env.size(), 0, 0));
if (success)
break;
}
}
__attribute__((constructor)) __attribute__((constructor))
static void inject_init() { static void inject_init() {
inject_logging(); inject_logging();
@ -90,6 +110,8 @@ static void inject_init() {
new_daemon_thread(&unload_first_stage); new_daemon_thread(&unload_first_stage);
unsetenv(INJECT_ENV_2); unsetenv(INJECT_ENV_2);
sanitize_environ();
// TODO: actually inject stuffs, for now we demonstrate clean self unloading // TODO: actually inject stuffs, for now we demonstrate clean self unloading
self_unload(); self_unload();
} }
@ -120,5 +142,5 @@ int app_process_main(int argc, char *argv[]) {
// Execute real app_process // Execute real app_process
xumount2(buf, MNT_DETACH); xumount2(buf, MNT_DETACH);
execve(buf, argv, environ); execve(buf, argv, environ);
exit(1); return 1;
} }