From 0e9307bfd6fe44d055a022b99ef3e9fec17a7d20 Mon Sep 17 00:00:00 2001 From: echo Date: Tue, 12 Nov 2024 11:34:03 -0500 Subject: [PATCH 01/46] remove: Rust dependencies information from `README.md` (#74) This commit removes information about Rust dependencies used in previous Zygiskd from "README.md" file. --- README.md | 19 ------------------- README_CN.md | 19 ------------------- 2 files changed, 38 deletions(-) diff --git a/README.md b/README.md index e28f4d8..0e6fde9 100644 --- a/README.md +++ b/README.md @@ -25,27 +25,8 @@ The Zygisk Next developers are famous and trusted in the Android community, howe | Tool | Description | |-----------------|----------------------------------------| -| `rustc` | The Rust compiler | | `Android NDK` | Native Development Kit for Android | -### Rust Dependencies - -| Dependency | Description | -|------------------|---------------------------------------------------------------| -| `android_logger` | Logger for Android platform | -| `anyhow` | Error handling library | -| `bitflags` | Macro to generate structures for bitwise operations | -| `const_format` | Compile-time string formatting | -| `futures` | Abstractions for asynchronous programming | -| `konst` | Compile-time constant evaluation | -| `lazy_static` | Macro for declaring lazily evaluated static variables | -| `libc` | FFI bindings to native C libraries | -| `log` | Logging facade | -| `memfd` | Memory file descriptor utilities | -| `num_enum` | Derive macros to convert between numbers and enums | -| `passfd` | Passing file descriptors over Unix sockets | -| `proc-maps` | Parse and analyze process memory maps | - ### C++ Dependencies | Dependency | Description | diff --git a/README_CN.md b/README_CN.md index 7d03c7f..6b5b29f 100644 --- a/README_CN.md +++ b/README_CN.md @@ -25,27 +25,8 @@ Zygisk Next 的开发者们在Android社区享有盛誉，备受信任。但这 | 工具 | 简介 | |---------------|------------------------------------| -| `rustc` | Rust 编译器 | | `Android NDK` | Android 本地开发工具包 | -### Rust 依赖 - -| 依赖 | 简介 | -|------------------|-------------------------------------------------------| -| `android_logger` | Android 日志记录工具 | -| `anyhow` | 错误处理库 | -| `bitflags` | 用于生成位操作结构的宏 | -| `const_format` | 编译时字符串格式化 | -| `futures` | 异步编程的抽象实现 | -| `konst` | 编译时常量比较 | -| `lazy_static` | 用于声明静态延迟比较变量的宏 | -| `libc` | 对各平台系统C语言库的原始 FFI 绑定 | -| `log` | 日志外观框架 | -| `memfd` | 内存文件描述符实用程序 | -| `num_enum` | 在数字类型和枚举类型之间进行转换的衍生宏 | -| `passfd` | 通过Unix套接字传递文件描述符 | -| `proc-maps` | 解析和分析进程内存映射 | - ### C++ 依赖 | 依赖 | 简介 | From 21325ec4093c661d4c73012a00ca0f37979653f8 Mon Sep 17 00:00:00 2001 From: SheepChef <50871867+SheepChef@users.noreply.github.com> Date: Wed, 13 Nov 2024 01:47:08 +0800 Subject: [PATCH 02/46] fix: WebUI branch URL in READMEs (#77) This commit fixes the URL of the new WebUI branch in the READMEs. Signed-off-by: SheepChef <50871867+SheepChef@users.noreply.github.com> --- README.md | 2 +- README_CN.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 0e6fde9..f65fa2d 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ There are currently no available stable releases. (Coming Soon) ## Translation -As of now, we don't have integration with another platform for translations but you may contribute to the [add/webui](https://github.com/PerformanC/ReZygisk/tree/add/webui) branch. Please don't forget to include your GitHub profile in [TRANSLATOR.md](https://github.com/PerformanC/ReZygisk/blob/add/webui/TRANSLATOR.md) so that people can see your contribution. +As of now, we don't have integration with another platform for translations but you may contribute to the [add/new-webui](https://github.com/PerformanC/ReZygisk/tree/add/new-webui) branch. Please don't forget to include your GitHub profile in [TRANSLATOR.md](https://github.com/PerformanC/ReZygisk/blob/add/new-webui/TRANSLATOR.md) so that people can see your contribution. ## Support For any question related to ReZygisk or other PerformanC projects, feel free to join any of the following channels below: diff --git a/README_CN.md b/README_CN.md index 6b5b29f..8da3c45 100644 --- a/README_CN.md +++ b/README_CN.md @@ -43,9 +43,9 @@ Zygisk Next 的开发者们在Android社区享有盛誉，备受信任。但这 ## 翻译 -您可以向 [add/webui](https://github.com/PerformanC/ReZygisk/tree/add/webui) 分支贡献翻译。 +您可以向 [add/new-webui](https://github.com/PerformanC/ReZygisk/tree/add/new-webui) 分支贡献翻译。 -请不要忘记在 [TRANSLATOR.md](https://github.com/PerformanC/ReZygisk/blob/add/webui/TRANSLATOR.md) 中添加您的 GitHub 账号信息，以便人们看到您的贡献。 +请不要忘记在 [TRANSLATOR.md](https://github.com/PerformanC/ReZygisk/blob/add/new-webui/TRANSLATOR.md) 中添加您的 GitHub 账号信息，以便人们看到您的贡献。 ## 支持 From f4af759aabffc2e8d24c9fd9ca42257b69d6e19b Mon Sep 17 00:00:00 2001 From: ThePedroo Date: Tue, 12 Nov 2024 20:38:28 -0300 Subject: [PATCH 03/46] fix: `free` in garbage data pointer; fix: Zygiskd wrong message length This commit fixes the issue where "free" would be executed in a pointer which has garbage data, leading to crashes. This was fixed by setting to NULL, so that it's clean. It also fixes the issue where Zygiskd messages for "DAEMON_SET_INFO" would not count the NULL-terminator, causing crashes. --- loader/src/ptracer/monitor.cpp | 4 ++-- zygiskd/src/zygiskd.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/loader/src/ptracer/monitor.cpp b/loader/src/ptracer/monitor.cpp index 805b2c0..36f4bdc 100644 --- a/loader/src/ptracer/monitor.cpp +++ b/loader/src/ptracer/monitor.cpp @@ -117,8 +117,8 @@ struct Status { bool zygote_injected = false; bool daemon_running = false; pid_t daemon_pid = -1; - char *daemon_info; - char *daemon_error_info; + char *daemon_info = NULL; + char *daemon_error_info = NULL; }; Status status64; diff --git a/zygiskd/src/zygiskd.c b/zygiskd/src/zygiskd.c index 93338ae..dcb88d8 100644 --- a/zygiskd/src/zygiskd.c +++ b/zygiskd/src/zygiskd.c @@ -394,7 +394,7 @@ void zygiskd_start(char *restrict argv[]) { size_t msg_length = strlen("Root: , Modules: ") + strlen(impl_name) + module_list_len + 1; struct MsgHead *msg = malloc(sizeof(struct MsgHead) + msg_length); - msg->length = snprintf(msg->data, msg_length, "Root: %s, Modules: %s", impl_name, module_list); + msg->length = snprintf(msg->data, msg_length, "Root: %s, Modules: %s", impl_name, module_list) + 1; msg->cmd = DAEMON_SET_INFO; unix_datagram_sendto(CONTROLLER_SOCKET, (void *)msg, sizeof(struct MsgHead) + msg->length); From 7da7b8bd07638c4d03ffea2ec157e954ad36c000 Mon Sep 17 00:00:00 2001 From: Keeperorowner Date: Fri, 15 Nov 2024 06:16:23 +0800 Subject: [PATCH 04/46] improve: Simplified Chinese README translation (#80) This commit improves translations in the Simplified Chinese README. Signed-off-by: Keeperorowner --- README_CN.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README_CN.md b/README_CN.md index 8da3c45..bcdb007 100644 --- a/README_CN.md +++ b/README_CN.md @@ -11,9 +11,9 @@ ReZygisk 是 Zygisk 的另一个独立实现，从 Zygisk Next 分叉而来， > > 您可以从 [Actions](https://github.com/PerformanC/ReZygisk/actions) 页面下载自动构建包，但要注意自负风险。使用不稳定的版本时，设备可能会陷入启动循环(Bootloop)。 -## 为什么要ReZygisk？ +## 为什么要选择 ReZygisk？ -最新版本的 Zygisk Next 并不开源，仅其核心开发者有权查阅全部源代码。这不仅阻止了其他开发者贡献代码，还阻止了他们对项目代码进行审计。Zygisk Next 是一个以超级用户(root)权限运行的模块，可以访问整个系统，闭源后存在重大安全隐患。 +最新版本的 Zygisk Next 并不开源，仅其核心开发者有权查阅全部源代码。这不仅阻止了其他开发者贡献代码，还阻止了他人对项目代码进行审计。Zygisk Next 是一个以超级用户(root)权限运行的模块，可以访问整个系统，闭源后存在重大安全隐患。 Zygisk Next 的开发者们在Android社区享有盛誉，备受信任。但这并不意味着他们的项目就一定没有任何恶意代码和漏洞。我们(PerformanC)理解他们出于某些原因不愿保持开源，但我们坚信，开源是更好的选择。 From 5d9276e9e0d0da2cf33af6900eddea91a1384c2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E6=84=8F=E6=8C=BD=E7=A7=8B=E9=A2=A8?= <94283631+RejectVanity@users.noreply.github.com> Date: Sun, 17 Nov 2024 00:32:22 +0800 Subject: [PATCH 05/46] add: `README_zh-TW.md` translation (#84) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit adds Traditional Chinese translation for README. Signed-off-by: 何意挽秋風 <94283631+RejectVanity@users.noreply.github.com> --- README.md | 2 +- README_CN.md => READMEs/README_zh-CN.md | 8 ++-- READMEs/README_zh-TW.md | 62 +++++++++++++++++++++++++ 3 files changed, 67 insertions(+), 5 deletions(-) rename README_CN.md => READMEs/README_zh-CN.md (92%) create mode 100644 READMEs/README_zh-TW.md diff --git a/README.md b/README.md index f65fa2d..3fbf1e8 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # ReZygisk -[中文](https://github.com/PerformanC/ReZygisk/blob/main/README_CN.md) +[简体中文](/READMEs/README_zh-CN.md)|[繁體中文](/READMEs/README_zh-TW.md) ReZygisk is a fork of Zygisk Next, a standalone implementation of Zygisk, providing Zygisk API support for KernelSU, Magisk (besides built-in), and APatch (Work In Progress). diff --git a/README_CN.md b/READMEs/README_zh-CN.md similarity index 92% rename from README_CN.md rename to READMEs/README_zh-CN.md index bcdb007..da3af96 100644 --- a/README_CN.md +++ b/READMEs/README_zh-CN.md @@ -23,15 +23,15 @@ Zygisk Next 的开发者们在Android社区享有盛誉，备受信任。但这 ## 依赖 -| 工具 | 简介 | +| 工具 | 简介 | |---------------|------------------------------------| -| `Android NDK` | Android 本地开发工具包 | +| `Android NDK` | Android 本地开发工具包 | ### C++ 依赖 -| 依赖 | 简介 | +| 依赖 | 简介 | |---------|-----------------------------| -| `lsplt` | Android 程序链接表钩子 | +| `lsplt` | Android 程序链接表钩子 | ## 用法 diff --git a/READMEs/README_zh-TW.md b/READMEs/README_zh-TW.md new file mode 100644 index 0000000..5762ead --- /dev/null +++ b/READMEs/README_zh-TW.md @@ -0,0 +1,62 @@ +# ReZygisk +> 繁體中文（README_zh-TW.md）是根據[英文版自述檔案（README.md）](https://github.com/PerformanC/ReZygisk/blob/main/README.md)翻譯，僅供參考以便理解英文內容，翻譯可能滯後。 + +ReZygisk 是 Zygisk Next 的一個分支，這是一個獨立實現的 Zygisk，為 KernelSU、Magisk（除了內建支援外）和 APatch（開發中）提供 Zygisk API 支援。 + +此專案致力於用 C 語言重寫原有的 C++ 和 Rust 代碼，藉此以更現代且高效的方式實現 Zygisk API，並採用更寬鬆的授權條款。 + +> [!NOTE] +> 此模組/分支仍在開發中（WIP）；請僅安裝正式版本的壓縮包。 +> +> 雖然你可以從 [Actions](https://github.com/PerformanC/ReZygisk/actions) 頁面安裝 .zip 檔，但若因此導致裝置進入開機循環（Bootloop），後果須自行承擔。 + +## 為什麼選擇ReZygisk？ + +最新版本的 Zygisk Next 已轉為閉源，只有核心開發者能查閱完整的原始碼。這不僅限制了其他開發者的貢獻，也無法進行代碼審計。由於 Zygisk Next 是一個以超級使用者（root）權限運行的模組，能夠存取整個系統，若閉源將帶來重大的安全風險。 + +雖然 Zygisk Next 的開發者在 Android 社群中享有盛譽，並且備受信任，但這並不代表他們的專案就完全沒有任何惡意程式碼或漏洞。我們（PerformanC）理解他們因某些原因選擇保持閉源，但我們堅信開源才是更好的選擇。 + +## 優勢 + +- 永遠是自由及開放原始碼軟體（FOSS） + +## 依賴項 + +| 工具 | 說明 | +|-----------------|---------------------------------------| +| `Android NDK` | Android 原生開發工具包 | + +### C++ 依賴項 + +| 依賴 | 說明 | +|----------|----------------------------------------------| +| `lsplt` | Android 的簡單 PLT（程式連結表） 勾取 | + +## 用法 + +我們目前正在開發中。（敬請期待） + +## 安裝 + +目前沒有穩定版本可供下載。（敬請期待） + +## 翻譯 + +目前我們尚未與其他平台整合進行翻譯，但您可以為 [add/new-webui](https://github.com/PerformanC/ReZygisk/tree/add/new-webui)分支做出貢獻。請別忘了在 [TRANSLATOR.md](https://github.com/PerformanC/ReZygisk/blob/add/new-webui/TRANSLATOR.md) 中包含您的 GitHub 個人檔案，讓大家能夠看到您的貢獻。 + +## 支援 +如有關於 ReZygisk 或其他 PerformanC 專案的任何問題，歡迎加入以下任一頻道： + +- Discord 頻道: [PerformanC](https://discord.gg/uPveNfTuCJ) +- ReZygisk Telegram 頻道: [@rezygiskchat](https://t.me/rezygiskchat) +- PerformanC Telegram 頻道: [@performancorg](https://t.me/performancorg) + +## 貢獻 + +要為 ReZygisk 貢獻，必須遵循 PerformanC 的[貢獻指南](https://github.com/PerformanC/contributing)，並遵守其安全政策、行為準則以及語法標準。 + +## 授權條款 + +在 ReZygisk 專案中，舊的 Zygisk Next 部分採用了 GPL 授權，而由 PerformanC 組織重寫的程式碼則採用 AGPL 3.0 授權。 + +您可以在[開放原始碼倡議（Open Source Initiative）](https://opensource.org/licenses/AGPL-3.0)上閱讀更多相關資訊。 From b5b5c2f9d8d88c08bf70dfba55a3127512c4b1d3 Mon Sep 17 00:00:00 2001 From: Fyphen Date: Sat, 23 Nov 2024 16:48:49 +0900 Subject: [PATCH 06/46] add: ja_JP README (#88) * Create README_ja-JP.md Signed-off-by: Fyphen * Update README_ja-JP.md Signed-off-by: Fyphen --------- Signed-off-by: Fyphen --- READMEs/README_ja-JP.md | 73 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 READMEs/README_ja-JP.md diff --git a/READMEs/README_ja-JP.md b/READMEs/README_ja-JP.md new file mode 100644 index 0000000..80633b8 --- /dev/null +++ b/READMEs/README_ja-JP.md @@ -0,0 +1,73 @@ +# ReZygisk + +[English](https://github.com/PerformanC/ReZygisk/blob/main/README.md)|[简体中文](/READMEs/README_zh-CN.md)|[繁體中文](/READMEs/README_zh-TW.md) + +ReZygiskはkernelSU、Magisk、APatchにZygiskのAPIサポートを提供するスタンドアローンZygiskであるZygisk Nextのフォークです。 + +ReZygiskは更に高速かつ効率的なZygisk APIとより寛容なライセンスを、コードベースをC（もともとはC++とRustでした）でアップデート/書き直すことで実現することを目標としています。 + +> [!NOTE] +> このモジュール/フォークはWIP（Work in Progress、すべての作業が進行中であることを意味します）: ReleasesタブのZipのみを使用するようにしてください。 +> +> GitHub [Actions](https://github.com/PerformanC/ReZygisk/actions) よりZipをダウンロードして使用することも可能ですが、デバイスがブートループなどの不具合が起きる可能性があります。ユーザー自身の裁量にて使用してください。 + +## ReZygiskを使う理由 + +Zygisk Nextの最新リリースはクローズドソースであり、コードはプロジェクトの開発者のみアクセスできるものです。これはコミュニティがコードに貢献することを妨げるだけではなく、コード監査をも難しくしています。これはZygisk Nextがルート権限で作動するアプリであるため、セキュリティ上深刻な問題です。 + +Zygisk Nextの開発者はAndroid Communityにて有名かつ信用されています。が、これはコード自体が悪意の無いこと/脆弱でないことを証明するものではありません。 + +我々（PerformanC）はZygisk Nextの開発者らがコードをクローズドに保つ重要な理由があることは承知していますが、我々はオープンソース/コミュニティドリブンにすることが重要だと考えています。 + +## メリット + +- オープンソース、Free to Use、FOSS (永続的) + +## 依存関係 + +| ツール | 説明 | +|-----------------|----------------------------------------| +| `Android NDK` | Androidのネイティブ開発環境キット | + +### C++ 依存関係 + +| 依存 | 説明 | +|------------|-------------------------------| +| `lsplt` | シンプルなAndroidのPLTフック | + +## 使い方 + +ただいま調理中です、しばらくお待ち下さい！（できるだけ早くお届けします） + +## インストール + +現状、ステーブルリリースはありません。（できるだけ早くお届けします） + +## 翻訳 + +現状では、翻訳を他のプラットフォーム上で展開することはしていません。 + +が、[add/new-webui](https://github.com/PerformanC/ReZygisk/tree/add/new-webui) ブランチにて翻訳作業に参加していただくことができます。 + +他の開発者さんたちがあなたの貢献を確認できるように、 [TRANSLATOR.md](https://github.com/PerformanC/ReZygisk/blob/add/new-webui/TRANSLATOR.md) にあなたのプロフィールを追加することを忘れないでください！ + +## サポート +For any question related to ReZygisk or other PerformanC projects, feel free to join any of the following channels below: +ReZygisk/他のPerformanCのプロジェクトに対する質問がある場合は、以下のどれかに参加してください！ + +- Discord チャンネル: [PerformanC](https://discord.gg/uPveNfTuCJ) +- ReZygisk Telegram チャンネル: [@rezygiskchat](https://t.me/rezygiskchat) +- PerformanC Telegram チャンネル: [@performancorg](https://t.me/performancorg) + +## 貢献 + +貢献をしたい場合、PerformanCの[Contribution Guidelines](https://github.com/PerformanC/contributing)に従うことが必要になります。 + +セキュリティーポリシー、行動規範、シンタックススタンダードを採用してください。 + +## ライセンス + +ReZygiskは基本的にDr-TSNGによるGPLライセンス下にてライセンスされています。 + +ただし、書き直しされたコードに関してはPerformanCによるAGPL3.0ライセンスにてライセンスされています。 +詳細については [Open Source Initiative](https://opensource.org/licenses/AGPL-3.0) を参照してください。 From d498a9ab0177eb9087e7eef3978a22640f6cfaa5 Mon Sep 17 00:00:00 2001 From: JingMatrix Date: Sun, 24 Nov 2024 19:18:50 +0100 Subject: [PATCH 07/46] fix: trigger Zygisk modules service.sh in parallel (#91) This commit fixes 2 issues: - service.sh of files were not being executed in parallel, a behavior described in: https://github.com/topjohnwu/Magisk/blob/master/docs/guides.md#boot-scripts . This was fixed by using "&" in the end of the command to execute the module's service.sh, telling the shell to not block. - Gradle wrapper used in ReZygisk was old, causing failing CIs. It also updates the NDK version to ensure we'll be operating smoothly. --- .github/workflows/ci.yml | 2 +- build.gradle.kts | 2 +- gradle/wrapper/gradle-wrapper.jar | Bin 63721 -> 43583 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 297 ++++++++++++++--------- gradlew.bat | 183 +++++++------- module/src/service.sh | 2 +- 7 files changed, 280 insertions(+), 208 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 61afb40..c7869ce 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,7 +30,7 @@ jobs: java-version: "17" - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3 + uses: gradle/actions/setup-gradle@v4.2.1 with: gradle-home-cache-cleanup: true diff --git a/build.gradle.kts b/build.gradle.kts index 445eb0f..fd2df21 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -33,7 +33,7 @@ val androidMinSdkVersion by extra(26) val androidTargetSdkVersion by extra(34) val androidCompileSdkVersion by extra(34) val androidBuildToolsVersion by extra("34.0.0") -val androidCompileNdkVersion by extra("26.0.10792818") +val androidCompileNdkVersion by extra("27.2.12479018") val androidSourceCompatibility by extra(JavaVersion.VERSION_11) val androidTargetCompatibility by extra(JavaVersion.VERSION_11) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7f93135c49b765f8051ef9d0a6055ff8e46073d8..a4b76b9530d66f5e68d973ea569d8e19de379189 100644 GIT binary patch literal 43583 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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 GZ~q4|mN%#X literal 63721 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鯊%1Et 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⁢ zv5o9#E7!G0XmdzfsS{efPNi`1b44~SZ4Z8fuX!I}#8g+(wxzQwUT#Xb2(tbY1+EUhGKoT@KEU9Ktl>_0 z%bjDJg;#*gtJZv!-Zs`?^}v5eKmnbjqlvnSzE@_SP|LG_PJ6CYU+6zY6>92%E+ z=j@TZf-iW4(%U{lnYxQA;7Q!b;^brF8n0D>)`q5>|WDDXLrqYU_tKN2>=#@~OE7grMnNh?UOz-O~6 z6%rHy{#h9K0AT+lDC7q4{hw^|q6*Ry;;L%Q@)Ga}$60_q%D)rv(CtS$CQbpq9|y1e zRSrN4;$Jyl{m5bZw`$8TGvb}(LpY{-cQ)fcyJv7l3S52TLXVDsphtv&aPuDk1OzCA z4A^QtC(!11`IsNx_HnSy?>EKpHJWT^wmS~hc^p^zIIh@9f6U@I2 zC=Mve{j2^)mS#U$e{@Q?SO6%LDsXz@SY+=cK_QMmXBIU)j!$ajc-zLx3V60EXJ!qC zi<%2x8Q24YN+&8U@CIlN zrZkcT9yh%LrlGS9`G)KdP(@9Eo-AQz@8GEFWcb7U=a0H^ZVbLmz{+&M7W(nXJ4sN8 zJLR7eeK(K8`2-}j(T7JsO`L!+CvbueT%izanm-^A1Dn{`1Nw`9P?cq;7no+XfC`K(GO9?O^5zNIt4M+M8LM0=7Gz8UA@Z0N+lg+cX)NfazRu z5D)~HA^(u%w^cz+@2@_#S|u>GpB+j4KzQ^&Wcl9f z&hG#bCA(Yk0D&t&aJE^xME^&E-&xGHhXn%}psEIj641H+Nl-}boj;)Zt*t(4wZ5DN z@GXF$bL=&pBq-#vkTkh>7hl%K5|3 z{`Vn9b$iR-SoGENp}bn4;fR3>9sA%X2@1L3aE9yTra;Wb#_`xWwLSLdfu+PAu+o3| zGVnpzPr=ch{uuoHjtw7+_!L_2;knQ!DuDl0R`|%jr+}jFzXtrHIKc323?JO{l&;VF z*L1+}JU7%QJOg|5|Tc|D8fN zJORAg=_vsy{ak|o);@)Yh8Lkcg@$FG3k@ep36BRa^>~UmnRPziS>Z=`Jb2x*Q#`%A zU*i3&Vg?TluO@X0O;r2Jl6LKLUOVhSqg1*qOt^|8*c7 zo(298@+r$k_wQNGHv{|$tW(T8L+4_`FQ{kEW5Jgg{yf7ey4ss_(SNKfz(N9lx&a;< je(UuV8hP?p&}TPdm1I$XmG#(RzlD&B2izSj9sl%y5~4qc diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3fa8f86..df97d72 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 4f906e0..f5feea6 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,69 +15,104 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +122,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,88 +133,120 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=`expr $i + 1` - done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 107acd3..9b42019 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,89 +1,94 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/module/src/service.sh b/module/src/service.sh index d544d9d..20a24ce 100644 --- a/module/src/service.sh +++ b/module/src/service.sh @@ -15,7 +15,7 @@ if [ "$(which magisk)" ]; then if [ -f "$file/service.sh" ]; then cd "$file" log -p i -t "zygisk-sh" "Manually trigger service.sh for $file" - sh "$(realpath ./service.sh)" + sh "$(realpath ./service.sh)" & cd "$MODDIR" fi fi From 9bcbec91aa60f2faa7ff6b4e96f87ad4b5f1405d Mon Sep 17 00:00:00 2001 From: JingMatrix Date: Sun, 24 Nov 2024 18:15:31 +0100 Subject: [PATCH 08/46] improve: turn on CMAKE_EXPORT_COMPILE_COMMANDS To make `clangd` work properly, one needs to make symbolic links ``` ln -sf $PWD/loader/build/tools/debug/arm64-v8a/compile_commands.json loader/build ``` --- loader/build.gradle.kts | 1 + loader/src/CMakeLists.txt | 2 ++ 2 files changed, 3 insertions(+) diff --git a/loader/build.gradle.kts b/loader/build.gradle.kts index 144ffba..442f3a2 100644 --- a/loader/build.gradle.kts +++ b/loader/build.gradle.kts @@ -49,6 +49,7 @@ android { externalNativeBuild.cmake { path("src/CMakeLists.txt") + buildStagingDirectory = layout.buildDirectory.get().asFile } defaultConfig { diff --git a/loader/src/CMakeLists.txt b/loader/src/CMakeLists.txt index c8dc73a..84ba7b9 100644 --- a/loader/src/CMakeLists.txt +++ b/loader/src/CMakeLists.txt @@ -3,6 +3,8 @@ project("loader") find_package(cxx REQUIRED CONFIG) +set(CMAKE_EXPORT_COMPILE_COMMANDS ON) + add_definitions(-DZKSU_VERSION=\"${ZKSU_VERSION}\") aux_source_directory(common COMMON_SRC_LIST) From 3d79939d7bb30841c5f85013dfab9515fd1a4145 Mon Sep 17 00:00:00 2001 From: JingMatrix Date: Fri, 29 Nov 2024 08:16:54 +0100 Subject: [PATCH 09/46] fix: linker64 static symbols lookup with suffix On Android 15+ in some devices, the symbol names of some static variables such as `solist`, has a `llvm` suffix in its exported name. Current commit handles this case and close #63 as fixed. --- loader/src/common/elf_util.cpp | 28 ++++++ loader/src/include/elf_util.h | 6 ++ loader/src/include/solist.hpp | 171 +++++++++++++++++++-------------- 3 files changed, 134 insertions(+), 71 deletions(-) diff --git a/loader/src/common/elf_util.cpp b/loader/src/common/elf_util.cpp index 4ea0732..d265b3c 100644 --- a/loader/src/common/elf_util.cpp +++ b/loader/src/common/elf_util.cpp @@ -179,6 +179,7 @@ ElfW(Addr) ElfImg::LinearLookup(std::string_view name) const { } } } + if (auto i = symtabs_.find(name); i != symtabs_.end()) { return i->second->st_value; } else { @@ -186,6 +187,33 @@ ElfW(Addr) ElfImg::LinearLookup(std::string_view name) const { } } +std::string_view ElfImg::LinearLookupByPrefix(std::string_view name) const { + if (symtabs_.empty()) { + symtabs_.reserve(symtab_count); + if (symtab_start != nullptr && symstr_offset_for_symtab != 0) { + for (ElfW(Off) i = 0; i < symtab_count; i++) { + unsigned int st_type = ELF_ST_TYPE(symtab_start[i].st_info); + const char *st_name = offsetOf(header, symstr_offset_for_symtab + + symtab_start[i].st_name); + if ((st_type == STT_FUNC || st_type == STT_OBJECT) && symtab_start[i].st_size) { + symtabs_.emplace(st_name, &symtab_start[i]); + } + } + } + } + + auto size = name.size(); + for (auto symtab : symtabs_) { + if (symtab.first.size() < size) continue; + + if (symtab.first.substr(0, size) == name) { + return symtab.first; + } + } + + return ""; +} + ElfImg::~ElfImg() { //open elf file local diff --git a/loader/src/include/elf_util.h b/loader/src/include/elf_util.h index 95559f8..1b8c0b7 100644 --- a/loader/src/include/elf_util.h +++ b/loader/src/include/elf_util.h @@ -48,6 +48,10 @@ namespace SandHook { } } + std::string_view findSymbolNameByPrefix(std::string_view prefix) const { + return LinearLookupByPrefix(prefix); + } + template constexpr T getSymbAddress(std::string_view name) const { return reinterpret_cast(getSymbAddress(name)); @@ -72,6 +76,8 @@ namespace SandHook { ElfW(Addr) LinearLookup(std::string_view name) const; + std::string_view LinearLookupByPrefix(std::string_view name) const; + constexpr static uint32_t ElfHash(std::string_view name); constexpr static uint32_t GnuHash(std::string_view name); diff --git a/loader/src/include/solist.hpp b/loader/src/include/solist.hpp index 5feb94d..73ff917 100644 --- a/loader/src/include/solist.hpp +++ b/loader/src/include/solist.hpp @@ -6,98 +6,127 @@ #include #include "elf_util.h" -namespace SoList -{ - class SoInfo { - public: -#ifdef __LP64__ +namespace SoList { + class SoInfo { + public: + #ifdef __LP64__ inline static size_t solist_next_offset = 0x30; constexpr static size_t solist_realpath_offset = 0x1a8; -#else + #else inline static size_t solist_next_offset = 0xa4; constexpr static size_t solist_realpath_offset = 0x174; -#endif + #endif - inline static const char *(*get_realpath_sym)(SoInfo *) = nullptr; - inline static const char *(*get_soname_sym)(SoInfo *) = nullptr; + inline static const char *(*get_realpath_sym)(SoInfo *) = NULL; + inline static const char *(*get_soname_sym)(SoInfo *) = NULL; - inline SoInfo *get_next() { - return *(SoInfo **) ((uintptr_t) this + solist_next_offset); - } + inline SoInfo *get_next() { + return *(SoInfo **) ((uintptr_t) this + solist_next_offset); + } - inline const char *get_path() { - return get_realpath_sym ? get_realpath_sym(this) : ((std::string *) ((uintptr_t) this + solist_realpath_offset))->c_str(); - } + inline const char *get_path() { + if (get_realpath_sym) return get_realpath_sym(this); - inline const char *get_name() { - return get_soname_sym ? get_soname_sym(this) : *((const char **) ((uintptr_t) this + solist_realpath_offset - sizeof(void *))); - } + return ((std::string *) ((uintptr_t) this + solist_realpath_offset))->c_str(); + } - void nullify_name() { - const char** name = (const char**)get_soname_sym(this); + inline const char *get_name() { + if (get_soname_sym) return get_soname_sym(this); - static const char* empty_string = ""; - *name = reinterpret_cast(&empty_string); - } + return ((std::string *) ((uintptr_t) this + solist_realpath_offset - sizeof(void *)))->c_str(); + } - void nullify_path() { - const char** name = (const char**)get_realpath_sym(this); + void nullify_name() { + const char **name = (const char**)get_soname_sym(this); - static const char* empty_string = ""; - *name = reinterpret_cast(&empty_string); - } - }; + static const char *empty_string = ""; + *name = reinterpret_cast(&empty_string); + } - static SoInfo *solist = nullptr; - static SoInfo *somain = nullptr; + void nullify_path() { + const char **name = (const char**)get_realpath_sym(this); - template - inline T *getStaticPointer(const SandHook::ElfImg &linker, const char* name) - { - auto *addr = reinterpret_cast(linker.getSymbAddress(name)); - return addr == nullptr ? nullptr : *addr; + static const char *empty_string = ""; + *name = reinterpret_cast(&empty_string); + } + }; + + static SoInfo *solist = NULL; + static SoInfo *somain = NULL; + + template + inline T *getStaticPointer(const SandHook::ElfImg &linker, const char *name) { + auto *addr = reinterpret_cast(linker.getSymbAddress(name)); + + return addr == NULL ? NULL : *addr; + } + + static void NullifySoName(const char* target_name) { + for (auto *iter = solist; iter; iter = iter->get_next()) { + if (iter->get_name() && iter->get_path() && strstr(iter->get_path(), target_name)) { + iter->nullify_path(); + LOGI("Cleared SOList entry for %s", target_name); + } } - static void NullifySoName(const char* target_name) { - for (auto *iter = solist; iter; iter = iter->get_next()) { - if (iter->get_name() && iter->get_path() && strstr(iter->get_path(), target_name)) { - iter->nullify_path(); - LOGI("Cleared SOList entry for %s", target_name); - } - } + for (auto *iter = somain; iter; iter = iter->get_next()) { + if (iter->get_name() && iter->get_path() && strstr(iter->get_path(), target_name)) { + iter->nullify_path(); - for (auto *iter = somain; iter; iter = iter->get_next()) { - if (iter->get_name() && iter->get_path() && strstr(iter->get_path(), target_name)) { - iter->nullify_path(); - break; - } - } + break; + } + } + } + + static bool Initialize() { + SandHook::ElfImg linker("/linker"); + + /* INFO: Since Android 15, the symbol names for the linker have a suffix, + this makes it impossible to hardcode the symbol names. To allow + this to work on all versions, we need to iterate over the loaded + symbols and find the correct ones. + + See #63 for more information. + */ + + std::string_view solist_sym_name = linker.findSymbolNameByPrefix("__dl__ZL6solist"); + if (solist_sym_name.empty()) return false; + + /* INFO: The size isn't a magic number, it's the size for the string: .llvm.7690929523238822858 */ + char llvm_sufix[25 + 1]; + + if (solist_sym_name.length() != strlen("__dl__ZL6solist")) { + strncpy(llvm_sufix, solist_sym_name.data() + strlen("__dl__ZL6solist"), sizeof(llvm_sufix)); + } else { + llvm_sufix[0] = '\0'; } - static bool Initialize() { - SandHook::ElfImg linker("/linker"); - solist = getStaticPointer(linker, "__dl__ZL6solist"); - somain = getStaticPointer(linker, "__dl__ZL6somain"); + solist = getStaticPointer(linker, solist_sym_name.data()); + if (solist == NULL) return false; - if (solist != nullptr && somain != nullptr) - { - SoInfo::get_realpath_sym = reinterpret_cast(linker.getSymbAddress("__dl__ZNK6soinfo12get_realpathEv")); - SoInfo::get_soname_sym = reinterpret_cast(linker.getSymbAddress("__dl__ZNK6soinfo10get_sonameEv")); - auto vsdo = getStaticPointer(linker, "__dl__ZL4vdso"); + char somain_sym_name[sizeof("__dl__ZL6somain") + sizeof(llvm_sufix)]; + snprintf(somain_sym_name, sizeof(somain_sym_name), "__dl__ZL6somain%s", llvm_sufix); - for (size_t i = 0; i < 1024 / sizeof(void *); i++) - { - auto *possible_next = *(void **) ((uintptr_t) solist + i * sizeof(void *)); - if (possible_next == somain || (vsdo != nullptr && possible_next == vsdo)) - { - SoInfo::solist_next_offset = i * sizeof(void *); - break; - } - } + char vsdo_sym_name[sizeof("__dl__ZL4vdso") + sizeof(llvm_sufix)]; + snprintf(vsdo_sym_name, sizeof(vsdo_sym_name), "__dl__ZL4vdso%s", llvm_sufix); - return (SoInfo::get_realpath_sym != nullptr && SoInfo::get_soname_sym != nullptr); - } + somain = getStaticPointer(linker, somain_sym_name); + if (somain == NULL) return false; - return false; + auto vsdo = getStaticPointer(linker, vsdo_sym_name); + + SoInfo::get_realpath_sym = reinterpret_cast(linker.getSymbAddress("__dl__ZNK6soinfo12get_realpathEv")); + SoInfo::get_soname_sym = reinterpret_cast(linker.getSymbAddress("__dl__ZNK6soinfo10get_sonameEv")); + + for (size_t i = 0; i < 1024 / sizeof(void *); i++) { + auto *possible_next = *(void **) ((uintptr_t) solist + i * sizeof(void *)); + if (possible_next == somain || (vsdo != NULL && possible_next == vsdo)) { + SoInfo::solist_next_offset = i * sizeof(void *); + + break; + } } -} \ No newline at end of file + + return (SoInfo::get_realpath_sym != NULL && SoInfo::get_soname_sym != NULL); + } +} From 6c41a8188d1911d76793c07b390d30693f7a14d7 Mon Sep 17 00:00:00 2001 From: JingMatrix Date: Fri, 29 Nov 2024 11:25:45 +0100 Subject: [PATCH 10/46] improve: drop soinfo records of loaded modules In Bionic linker, the `soinfo` structure has a field `next`, which points to the next loaded library in a linked list consisting of all loaded libraries. Hence, an injected process can easily find all loaded libraries. Previously in ReZygisk, module library records are hidden by setting the `pathname` field to be empty, which is futile but easier to detect. Current idea of dropping record can be found in the following commit: https://github.com/RikkaApps/Riru/commit/5d635e8c66a018b5086f28e083b18b0d0656022b --- loader/src/include/solist.hpp | 97 ++++++++++++++++++++++++++--------- loader/src/injector/hook.cpp | 8 +-- 2 files changed, 73 insertions(+), 32 deletions(-) diff --git a/loader/src/include/solist.hpp b/loader/src/include/solist.hpp index 73ff917..c65798b 100644 --- a/loader/src/include/solist.hpp +++ b/loader/src/include/solist.hpp @@ -5,6 +5,7 @@ #include #include "elf_util.h" +#include "logging.h" namespace SoList { class SoInfo { @@ -36,23 +37,59 @@ namespace SoList { return ((std::string *) ((uintptr_t) this + solist_realpath_offset - sizeof(void *)))->c_str(); } - void nullify_name() { - const char **name = (const char**)get_soname_sym(this); - - static const char *empty_string = ""; - *name = reinterpret_cast(&empty_string); - } - - void nullify_path() { - const char **name = (const char**)get_realpath_sym(this); - - static const char *empty_string = ""; - *name = reinterpret_cast(&empty_string); + void set_next(SoInfo *si) { + *(SoInfo **) ((uintptr_t) this + solist_next_offset) = si; } }; + class ProtectedDataGuard { + public: + ProtectedDataGuard() { + if (ctor != nullptr) + (this->*ctor)(); + } + + ~ProtectedDataGuard() { + if (dtor != nullptr) + (this->*dtor)(); + } + + static bool setup(const SandHook::ElfImg &linker) { + ctor = MemFunc{.data = {.p = reinterpret_cast(linker.getSymbAddress( + "__dl__ZN18ProtectedDataGuardC2Ev")), .adj = 0}}.f; + dtor = MemFunc{.data = {.p = reinterpret_cast(linker.getSymbAddress( + "__dl__ZN18ProtectedDataGuardD2Ev")), .adj = 0}}.f; + return ctor != nullptr && dtor != nullptr; + } + + ProtectedDataGuard(const ProtectedDataGuard &) = delete; + + void operator=(const ProtectedDataGuard &) = delete; + + private: + using FuncType = void (ProtectedDataGuard::*)(); + + static FuncType ctor; + static FuncType dtor; + + union MemFunc { + FuncType f; + + struct { + void *p; + std::ptrdiff_t adj; + } data; + }; + }; + + static SoInfo *solist = NULL; static SoInfo *somain = NULL; + static SoInfo **sonext = NULL; + ProtectedDataGuard::FuncType ProtectedDataGuard::ctor = NULL; + ProtectedDataGuard::FuncType ProtectedDataGuard::dtor = NULL; + + static bool Initialize(); template inline T *getStaticPointer(const SandHook::ElfImg &linker, const char *name) { @@ -61,25 +98,28 @@ namespace SoList { return addr == NULL ? NULL : *addr; } - static void NullifySoName(const char* target_name) { - for (auto *iter = solist; iter; iter = iter->get_next()) { - if (iter->get_name() && iter->get_path() && strstr(iter->get_path(), target_name)) { - iter->nullify_path(); - LOGI("Cleared SOList entry for %s", target_name); - } + static void DropSoPath(const char* target_path) { + if (solist == NULL && !Initialize()) { + LOGE("Failed to initialize solist"); + return; } - - for (auto *iter = somain; iter; iter = iter->get_next()) { - if (iter->get_name() && iter->get_path() && strstr(iter->get_path(), target_name)) { - iter->nullify_path(); - - break; + SoInfo *prev = NULL; + for (auto iter = solist; iter; iter = iter->get_next()) { + if (prev != NULL && iter->get_name() && iter->get_path() && strstr(iter->get_path(), target_path)) { + SoList::ProtectedDataGuard guard; + prev->set_next(iter->get_next()); + if (iter == *sonext) { + *sonext = prev; + } + LOGI("Dropped solist record for %s loaded at %s", iter->get_name(), iter->get_path()); } + prev = iter; } } static bool Initialize() { SandHook::ElfImg linker("/linker"); + if (!ProtectedDataGuard::setup(linker)) return false; /* INFO: Since Android 15, the symbol names for the linker have a suffix, this makes it impossible to hardcode the symbol names. To allow @@ -107,13 +147,20 @@ namespace SoList { char somain_sym_name[sizeof("__dl__ZL6somain") + sizeof(llvm_sufix)]; snprintf(somain_sym_name, sizeof(somain_sym_name), "__dl__ZL6somain%s", llvm_sufix); + char sonext_sym_name[sizeof("__dl__ZL6sonext") + sizeof(llvm_sufix)]; + snprintf(sonext_sym_name, sizeof(somain_sym_name), "__dl__ZL6sonext%s", llvm_sufix); + char vsdo_sym_name[sizeof("__dl__ZL4vdso") + sizeof(llvm_sufix)]; snprintf(vsdo_sym_name, sizeof(vsdo_sym_name), "__dl__ZL4vdso%s", llvm_sufix); somain = getStaticPointer(linker, somain_sym_name); if (somain == NULL) return false; - auto vsdo = getStaticPointer(linker, vsdo_sym_name); + sonext = linker.getSymbAddress(sonext_sym_name); + if (sonext == NULL) return false; + + SoInfo *vsdo = getStaticPointer(linker, vsdo_sym_name); + if (vsdo == NULL) return false; SoInfo::get_realpath_sym = reinterpret_cast(linker.getSymbAddress("__dl__ZNK6soinfo12get_realpathEv")); SoInfo::get_soname_sym = reinterpret_cast(linker.getSymbAddress("__dl__ZNK6soinfo10get_sonameEv")); diff --git a/loader/src/injector/hook.cpp b/loader/src/injector/hook.cpp index 4f02f6b..a1b715c 100644 --- a/loader/src/injector/hook.cpp +++ b/loader/src/injector/hook.cpp @@ -582,13 +582,7 @@ void ZygiskContext::run_modules_post() { m.tryUnload(); } - // Remove from SoList to avoid detection - bool solist_res = SoList::Initialize(); - if (!solist_res) { - LOGE("Failed to initialize SoList"); - } else { - SoList::NullifySoName("jit-cache"); - } + SoList::DropSoPath("jit-cache"); // Remap as well to avoid checking of /memfd:jit-cache for (auto &info : lsplt::MapInfo::Scan()) { From 060a1f3cf96000bcccf0891217d0afcc9de79e2b Mon Sep 17 00:00:00 2001 From: Md Arif <111168803+sabamdarif@users.noreply.github.com> Date: Sat, 7 Dec 2024 19:03:22 +0000 Subject: [PATCH 11/46] add: GrapheneOS support (#53) This commit adds support for devices that run GrapheneOS by hooking on JNI methods they renamed. Signed-off-by: Md Arif <111168803+sabamdarif@users.noreply.github.com> --- loader/src/injector/gen_jni_hooks.py | 19 +++++++-- loader/src/injector/jni_hooks.hpp | 59 ++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 3 deletions(-) diff --git a/loader/src/injector/gen_jni_hooks.py b/loader/src/injector/gen_jni_hooks.py index 1f134a5..a3adbf6 100644 --- a/loader/src/injector/gen_jni_hooks.py +++ b/loader/src/injector/gen_jni_hooks.py @@ -77,6 +77,7 @@ jintArray = JArray(jint) jstring = JType('jstring', 'Ljava/lang/String;') jboolean = JType('jboolean', 'Z') jlong = JType('jlong', 'J') +jlongArray = JArray(jlong) void = JType('void', 'V') class ForkAndSpec(JNIHook): @@ -210,6 +211,18 @@ server_l = ForkServer('l', [uid, gid, gids, runtime_flags, rlimits, server_samsung_q = ForkServer('samsung_q', [uid, gid, gids, runtime_flags, Anon(jint), Anon(jint), rlimits, permitted_capabilities, effective_capabilities]) +# GrapheneOS Android 14 Support +server_grapheneos_u = ForkServer('grapheneos_u', [uid, gid, gids, runtime_flags, Anon(jint), Anon(jint), rlimits, + permitted_capabilities, effective_capabilities]) + +fas_grapheneos_u = ForkAndSpec('grapheneos_u', [uid, gid, gids, runtime_flags, rlimits, mount_external, + se_info, nice_name, fds_to_close, fds_to_ignore, is_child_zygote, instruction_set, app_data_dir, + is_top_app, pkg_data_info_list, whitelisted_data_info_list, mount_data_dirs, mount_storage_dirs, mount_sysprop_overrides, Anon(jlongArray)]) + +spec_grapheneos_u = SpecApp('grapheneos_u', [uid, gid, gids, runtime_flags, rlimits, mount_external, + se_info, nice_name, is_child_zygote, instruction_set, app_data_dir, is_top_app, pkg_data_info_list, + whitelisted_data_info_list, mount_data_dirs, mount_storage_dirs, mount_sysprop_overrides, Anon(jlongArray)]) + hook_map = {} def gen_jni_def(clz, methods): @@ -245,13 +258,13 @@ with open('jni_hooks.hpp', 'w') as f: zygote = 'com/android/internal/os/Zygote' - methods = [fas_l, fas_o, fas_p, fas_q_alt, fas_r, fas_u, fas_samsung_m, fas_samsung_n, fas_samsung_o, fas_samsung_p] + methods = [fas_l, fas_o, fas_p, fas_q_alt, fas_r, fas_u, fas_samsung_m, fas_samsung_n, fas_samsung_o, fas_samsung_p, fas_grapheneos_u] f.write(gen_jni_def(zygote, methods)) - methods = [spec_q, spec_q_alt, spec_r, spec_u, spec_samsung_q] + methods = [spec_q, spec_q_alt, spec_r, spec_u, spec_samsung_q, spec_grapheneos_u] f.write(gen_jni_def(zygote, methods)) - methods = [server_l, server_samsung_q] + methods = [server_l, server_samsung_q, server_grapheneos_u] f.write(gen_jni_def(zygote, methods)) f.write('\n} // namespace\n') diff --git a/loader/src/injector/jni_hooks.hpp b/loader/src/injector/jni_hooks.hpp index b4daaaf..b31a7fd 100644 --- a/loader/src/injector/jni_hooks.hpp +++ b/loader/src/injector/jni_hooks.hpp @@ -127,6 +127,24 @@ void *nativeForkAndSpecialize_orig = nullptr; ctx.nativeForkAndSpecialize_post(); return ctx.pid; } +[[clang::no_stack_protector]] jint nativeForkAndSpecialize_grapheneos_u(JNIEnv *env, jclass clazz, jint uid, jint gid, jintArray gids, jint runtime_flags, jobjectArray rlimits, jint mount_external, jstring se_info, jstring nice_name, jintArray fds_to_close, jintArray fds_to_ignore, jboolean is_child_zygote, jstring instruction_set, jstring app_data_dir, jboolean is_top_app, jobjectArray pkg_data_info_list, jobjectArray whitelisted_data_info_list, jboolean mount_data_dirs, jboolean mount_storage_dirs, jboolean mount_sysprop_overrides, jlongArray _15) { + AppSpecializeArgs_v5 args(uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, instruction_set, app_data_dir); + args.fds_to_ignore = &fds_to_ignore; + args.is_child_zygote = &is_child_zygote; + args.is_top_app = &is_top_app; + args.pkg_data_info_list = &pkg_data_info_list; + args.whitelisted_data_info_list = &whitelisted_data_info_list; + args.mount_data_dirs = &mount_data_dirs; + args.mount_storage_dirs = &mount_storage_dirs; + args.mount_sysprop_overrides = &mount_sysprop_overrides; + ZygiskContext ctx(env, &args); + ctx.nativeForkAndSpecialize_pre(); + reinterpret_cast(nativeForkAndSpecialize_orig)( + env, clazz, uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, fds_to_close, fds_to_ignore, is_child_zygote, instruction_set, app_data_dir, is_top_app, pkg_data_info_list, whitelisted_data_info_list, mount_data_dirs, mount_storage_dirs, mount_sysprop_overrides, _15 + ); + ctx.nativeForkAndSpecialize_post(); + return ctx.pid; +} std::array nativeForkAndSpecialize_methods = { JNINativeMethod { "nativeForkAndSpecialize", @@ -178,6 +196,11 @@ std::array nativeForkAndSpecialize_methods = { "(II[II[[IILjava/lang/String;IILjava/lang/String;[I[IZLjava/lang/String;Ljava/lang/String;)I", (void *) &nativeForkAndSpecialize_samsung_p }, + JNINativeMethod { + "nativeForkAndSpecialize", + "(II[II[[IILjava/lang/String;Ljava/lang/String;[I[IZLjava/lang/String;Ljava/lang/String;Z[Ljava/lang/String;[Ljava/lang/String;ZZZ[J)I", + (void *) &nativeForkAndSpecialize_grapheneos_u + }, }; void *nativeSpecializeAppProcess_orig = nullptr; @@ -243,6 +266,22 @@ void *nativeSpecializeAppProcess_orig = nullptr; ); ctx.nativeSpecializeAppProcess_post(); } +[[clang::no_stack_protector]] void nativeSpecializeAppProcess_grapheneos_u(JNIEnv *env, jclass clazz, jint uid, jint gid, jintArray gids, jint runtime_flags, jobjectArray rlimits, jint mount_external, jstring se_info, jstring nice_name, jboolean is_child_zygote, jstring instruction_set, jstring app_data_dir, jboolean is_top_app, jobjectArray pkg_data_info_list, jobjectArray whitelisted_data_info_list, jboolean mount_data_dirs, jboolean mount_storage_dirs, jboolean mount_sysprop_overrides, jlongArray _16) { + AppSpecializeArgs_v5 args(uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, instruction_set, app_data_dir); + args.is_child_zygote = &is_child_zygote; + args.is_top_app = &is_top_app; + args.pkg_data_info_list = &pkg_data_info_list; + args.whitelisted_data_info_list = &whitelisted_data_info_list; + args.mount_data_dirs = &mount_data_dirs; + args.mount_storage_dirs = &mount_storage_dirs; + args.mount_sysprop_overrides = &mount_sysprop_overrides; + ZygiskContext ctx(env, &args); + ctx.nativeSpecializeAppProcess_pre(); + reinterpret_cast(nativeSpecializeAppProcess_orig)( + env, clazz, uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, is_child_zygote, instruction_set, app_data_dir, is_top_app, pkg_data_info_list, whitelisted_data_info_list, mount_data_dirs, mount_storage_dirs, mount_sysprop_overrides, _16 + ); + ctx.nativeSpecializeAppProcess_post(); +} std::array nativeSpecializeAppProcess_methods = { JNINativeMethod { "nativeSpecializeAppProcess", @@ -269,6 +308,11 @@ std::array nativeSpecializeAppProcess_methods = { "(II[II[[IILjava/lang/String;IILjava/lang/String;ZLjava/lang/String;Ljava/lang/String;)V", (void *) &nativeSpecializeAppProcess_samsung_q }, + JNINativeMethod { + "nativeSpecializeAppProcess", + "(II[II[[IILjava/lang/String;Ljava/lang/String;ZLjava/lang/String;Ljava/lang/String;Z[Ljava/lang/String;[Ljava/lang/String;ZZZ[J)V", + (void *) &nativeSpecializeAppProcess_grapheneos_u + }, }; void *nativeForkSystemServer_orig = nullptr; @@ -292,6 +336,16 @@ void *nativeForkSystemServer_orig = nullptr; ctx.nativeForkSystemServer_post(); return ctx.pid; } +[[clang::no_stack_protector]] jint nativeForkSystemServer_grapheneos_u(JNIEnv *env, jclass clazz, jint uid, jint gid, jintArray gids, jint runtime_flags, jint _13, jint _14, jobjectArray rlimits, jlong permitted_capabilities, jlong effective_capabilities) { + ServerSpecializeArgs_v1 args(uid, gid, gids, runtime_flags, permitted_capabilities, effective_capabilities); + ZygiskContext ctx(env, &args); + ctx.nativeForkSystemServer_pre(); + reinterpret_cast(nativeForkSystemServer_orig)( + env, clazz, uid, gid, gids, runtime_flags, _13, _14, rlimits, permitted_capabilities, effective_capabilities + ); + ctx.nativeForkSystemServer_post(); + return ctx.pid; +} std::array nativeForkSystemServer_methods = { JNINativeMethod { "nativeForkSystemServer", @@ -303,6 +357,11 @@ std::array nativeForkSystemServer_methods = { "(II[IIII[[IJJ)I", (void *) &nativeForkSystemServer_samsung_q }, + JNINativeMethod { + "nativeForkSystemServer", + "(II[IIII[[IJJ)I", + (void *) &nativeForkSystemServer_grapheneos_u + }, }; } // namespace From 8fb5d9197acde8f25e7932a5da3b7e3bd4d1a886 Mon Sep 17 00:00:00 2001 From: ThePedroo Date: Thu, 12 Dec 2024 20:10:38 -0300 Subject: [PATCH 12/46] fix: `magisk` file detection This commit fixes the detection for the "magisk" file which can be in 2 different folders, with 3 possible different names. --- zygiskd/src/root_impl/magisk.c | 35 ++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/zygiskd/src/root_impl/magisk.c b/zygiskd/src/root_impl/magisk.c index 298dc55..d33e71a 100644 --- a/zygiskd/src/root_impl/magisk.c +++ b/zygiskd/src/root_impl/magisk.c @@ -24,6 +24,7 @@ char *magisk_managers[] = { }; #define SBIN_MAGISK lp_select("/sbin/magisk32", "/sbin/magisk64") +#define BITLESS_SBIN_MAGISK "/sbin/magisk" #define DEBUG_RAMDISK_MAGISK lp_select("/debug_ramdisk/magisk32", "/debug_ramdisk/magisk64") #define BITLESS_DEBUG_RAMDISK_MAGISK "/debug_ramdisk/magisk" @@ -39,31 +40,41 @@ void magisk_get_existence(struct root_impl_state *state) { } errno = 0; - if (stat(DEBUG_RAMDISK_MAGISK, &s) != 0) { + if (stat(BITLESS_SBIN_MAGISK, &s) != 0) { if (errno != ENOENT) { - LOGE("Failed to stat Magisk %s binary: %s\n", DEBUG_RAMDISK_MAGISK, strerror(errno)); + LOGE("Failed to stat Magisk %s binary: %s\n", BITLESS_SBIN_MAGISK, strerror(errno)); } errno = 0; - if (stat(BITLESS_DEBUG_RAMDISK_MAGISK, &s) != 0) { + if (stat(DEBUG_RAMDISK_MAGISK, &s) != 0) { if (errno != ENOENT) { - LOGE("Failed to stat Magisk /debug_ramdisk/magisk binary: %s\n", strerror(errno)); + LOGE("Failed to stat Magisk %s binary: %s\n", DEBUG_RAMDISK_MAGISK, strerror(errno)); } errno = 0; - state->state = Inexistent; + if (stat(BITLESS_DEBUG_RAMDISK_MAGISK, &s) != 0) { + if (errno != ENOENT) { + LOGE("Failed to stat Magisk /debug_ramdisk/magisk binary: %s\n", strerror(errno)); + } + errno = 0; - return; + state->state = Inexistent; + + return; + } + + /* INFO: /debug_ramdisk/magisk64 (or 32) doesn't exist but /debug_ramdisk/magisk does */ + strcpy(path_to_magisk, BITLESS_DEBUG_RAMDISK_MAGISK); + } else { + /* INFO: /sbin/magisk doesn't exist but /debug_ramdisk/magisk does */ + strcpy(path_to_magisk, DEBUG_RAMDISK_MAGISK); } - - /* INFO: /debug_ramdisk/magisk64 (or 32) doesn't exist but /debug_ramdisk/magisk does */ - strcpy(path_to_magisk, BITLESS_DEBUG_RAMDISK_MAGISK); } else { - /* INFO: /sbin/magisk doesn't exist but /debug_ramdisk/magisk does */ - strcpy(path_to_magisk, DEBUG_RAMDISK_MAGISK); + /* INFO: /sbin/magisk64 (or 32) doesn't exist but /sbin/magisk does */ + strcpy(path_to_magisk, BITLESS_SBIN_MAGISK); } } else { - /* INFO: /sbin/magisk exists */ + /* INFO: /sbin/magisk64 (or 32) exists */ strcpy(path_to_magisk, SBIN_MAGISK); } From 5e43e4a71b5231cb8f822651e23228bca34ea87a Mon Sep 17 00:00:00 2001 From: JingMatrix Date: Thu, 12 Dec 2024 15:57:41 +0100 Subject: [PATCH 13/46] improve: hook pthread_attr_setstacksize Relying on dlclose to unload libzygisk.so will block us to clean its trace in the solist. This commit allows us to unmap libzygisk.so without using dlclose. To call munmap, we use the function pthread_attr_setstacksize instead of pthread_attr_destroy, so that tail-call can still be applied here since it has the same signature as munmap. --- loader/src/injector/entry.cpp | 11 ++++++----- loader/src/injector/hook.cpp | 18 ++++++++++-------- loader/src/injector/zygisk.hpp | 5 ++--- loader/src/ptracer/ptracer.cpp | 18 ++++++++++++++++-- 4 files changed, 34 insertions(+), 18 deletions(-) diff --git a/loader/src/injector/entry.cpp b/loader/src/injector/entry.cpp index 1cabc27..40a71b6 100644 --- a/loader/src/injector/entry.cpp +++ b/loader/src/injector/entry.cpp @@ -1,16 +1,17 @@ #include "daemon.h" #include "logging.h" #include "zygisk.hpp" -#include "module.hpp" using namespace std; -void *self_handle = nullptr; +void *start_addr = nullptr; +size_t block_size = 0; extern "C" [[gnu::visibility("default")]] -void entry(void* handle, const char* path) { +void entry(void* addr, size_t size, const char* path) { LOGI("Zygisk library injected, version %s", ZKSU_VERSION); - self_handle = handle; + start_addr = addr; + block_size = size; zygiskd::Init(path); if (!zygiskd::PingHeartbeat()) { @@ -22,6 +23,6 @@ void entry(void* handle, const char* path) { logging::setfd(zygiskd::RequestLogcatFd()); #endif - LOGI("Start hooking"); + LOGI("Start hooking, call %p", hook_functions); hook_functions(); } diff --git a/loader/src/injector/hook.cpp b/loader/src/injector/hook.cpp index a1b715c..16bb8d1 100644 --- a/loader/src/injector/hook.cpp +++ b/loader/src/injector/hook.cpp @@ -176,22 +176,24 @@ DCL_HOOK_FUNC(void, android_log_close) { // We cannot directly call `dlclose` to unload ourselves, otherwise when `dlclose` returns, // it will return to our code which has been unmapped, causing segmentation fault. -// Instead, we hook `pthread_attr_destroy` which will be called when VM daemon threads start. -DCL_HOOK_FUNC(int, pthread_attr_destroy, void *target) { - int res = old_pthread_attr_destroy((pthread_attr_t *)target); +// Instead, we hook `pthread_attr_setstacksize` which will be called when VM daemon threads start. +DCL_HOOK_FUNC(int, pthread_attr_setstacksize, void *target, size_t size) { + int res = old_pthread_attr_setstacksize((pthread_attr_t *)target, size); + LOGV("Call pthread_attr_setstacksize in [tid, pid]: %d, %d", gettid(), getpid()); // Only perform unloading on the main thread if (gettid() != getpid()) return res; - LOGV("pthread_attr_destroy"); + LOGV("Clean zygisk reminders"); if (should_unmap_zygisk) { unhook_functions(); if (should_unmap_zygisk) { - // Because both `pthread_attr_destroy` and `dlclose` have the same function signature, + // Because both `pthread_attr_setstacksize` and `dlclose` have the same function signature, // we can use `musttail` to let the compiler reuse our stack frame and thus - // `dlclose` will directly return to the caller of `pthread_attr_destroy`. - [[clang::musttail]] return dlclose(self_handle); + // `dlclose` will directly return to the caller of `pthread_attr_setstacksize`. + LOGV("Unmap libzygisk.so"); + [[clang::musttail]] return munmap(start_addr, block_size); } } @@ -858,7 +860,7 @@ static void hook_unloader() { } } - PLT_HOOK_REGISTER(art_dev, art_inode, pthread_attr_destroy); + PLT_HOOK_REGISTER(art_dev, art_inode, pthread_attr_setstacksize); hook_commit(); } diff --git a/loader/src/injector/zygisk.hpp b/loader/src/injector/zygisk.hpp index 5c06f8b..636367b 100644 --- a/loader/src/injector/zygisk.hpp +++ b/loader/src/injector/zygisk.hpp @@ -1,10 +1,9 @@ #pragma once -#include #include -#include -extern void *self_handle; +extern void *start_addr; +extern size_t block_size; void hook_functions(); diff --git a/loader/src/ptracer/ptracer.cpp b/loader/src/ptracer/ptracer.cpp index 9182ddd..f790f98 100644 --- a/loader/src/ptracer/ptracer.cpp +++ b/loader/src/ptracer/ptracer.cpp @@ -222,10 +222,24 @@ bool inject_on_main(int pid, const char *lib_path) { return false; } - /* call injector entry(handle, path) */ + /* record the address range of libzygisk.so */ + map = MapInfo::Scan(std::to_string(pid)); + void *start_addr = nullptr; + size_t block_size = 0; + for (auto &info : map) { + if (strstr(info.path.c_str(), "libzygisk.so")) { + void *addr = (void *)info.start; + if (start_addr == nullptr) start_addr = addr; + size_t size = info.end - info.start; + block_size += size; + LOGD("found block %s: [%p-%p] with size %zu", info.path.c_str(), addr, (void *)info.end, size); + } + } + /* call injector entry(start_addr, block_size, path) */ args.clear(); - args.push_back(remote_handle); + args.push_back((uintptr_t) start_addr); + args.push_back(block_size); str = push_string(pid, regs, zygiskd::GetTmpPath().c_str()); args.push_back((long) str); From b7138d635347f9d7848cdcd85710444b243370a2 Mon Sep 17 00:00:00 2001 From: JingMatrix Date: Sun, 15 Dec 2024 15:40:40 +0100 Subject: [PATCH 14/46] add: drop soinfo for libzygisk.so 1. fix typo vsdo -> vdso and allow this symbol to be not found, which is the case for the 32bit linkers on some devices 2. use soinfo_free to fully remove the soinfo record of libzygisk.so 3. set `soinfo.size = 0` to avoid the library being unmapped while removing its soinfo record 4. add more debug logs for troubleshooting --- loader/src/include/solist.hpp | 75 +++++++++++++++++++++++++--------- loader/src/injector/entry.cpp | 3 +- loader/src/injector/hook.cpp | 10 +++-- loader/src/injector/zygisk.hpp | 2 + 4 files changed, 66 insertions(+), 24 deletions(-) diff --git a/loader/src/include/solist.hpp b/loader/src/include/solist.hpp index c65798b..77ab4a5 100644 --- a/loader/src/include/solist.hpp +++ b/loader/src/include/solist.hpp @@ -11,20 +11,27 @@ namespace SoList { class SoInfo { public: #ifdef __LP64__ - inline static size_t solist_next_offset = 0x30; + inline static size_t solist_size_offset = 0x18; + inline static size_t solist_next_offset = 0x28; constexpr static size_t solist_realpath_offset = 0x1a8; #else + inline static size_t solist_size_offset = 0x90; inline static size_t solist_next_offset = 0xa4; constexpr static size_t solist_realpath_offset = 0x174; #endif inline static const char *(*get_realpath_sym)(SoInfo *) = NULL; inline static const char *(*get_soname_sym)(SoInfo *) = NULL; + inline static void (*soinfo_free)(SoInfo *) = NULL; inline SoInfo *get_next() { return *(SoInfo **) ((uintptr_t) this + solist_next_offset); } + inline size_t get_size() { + return *(size_t *) ((uintptr_t) this + solist_size_offset); + } + inline const char *get_path() { if (get_realpath_sym) return get_realpath_sym(this); @@ -40,6 +47,10 @@ namespace SoList { void set_next(SoInfo *si) { *(SoInfo **) ((uintptr_t) this + solist_next_offset) = si; } + + void set_size(size_t size) { + *(size_t *) ((uintptr_t) this + solist_size_offset) = size; + } }; class ProtectedDataGuard { @@ -69,8 +80,8 @@ namespace SoList { private: using FuncType = void (ProtectedDataGuard::*)(); - static FuncType ctor; - static FuncType dtor; + inline static FuncType ctor = NULL; + inline static FuncType dtor = NULL; union MemFunc { FuncType f; @@ -86,8 +97,6 @@ namespace SoList { static SoInfo *solist = NULL; static SoInfo *somain = NULL; static SoInfo **sonext = NULL; - ProtectedDataGuard::FuncType ProtectedDataGuard::ctor = NULL; - ProtectedDataGuard::FuncType ProtectedDataGuard::dtor = NULL; static bool Initialize(); @@ -103,23 +112,22 @@ namespace SoList { LOGE("Failed to initialize solist"); return; } - SoInfo *prev = NULL; for (auto iter = solist; iter; iter = iter->get_next()) { - if (prev != NULL && iter->get_name() && iter->get_path() && strstr(iter->get_path(), target_path)) { + if (iter->get_name() && iter->get_path() && strstr(iter->get_path(), target_path)) { SoList::ProtectedDataGuard guard; - prev->set_next(iter->get_next()); - if (iter == *sonext) { - *sonext = prev; + LOGI("dropping solist record for %s loaded at %s with size %zu", iter->get_name(), iter->get_path(), iter->get_size()); + if (iter->get_size() > 0) { + iter->set_size(0); + SoInfo::soinfo_free(iter); } - LOGI("Dropped solist record for %s loaded at %s", iter->get_name(), iter->get_path()); } - prev = iter; } } static bool Initialize() { SandHook::ElfImg linker("/linker"); if (!ProtectedDataGuard::setup(linker)) return false; + LOGD("found symbol ProtectedDataGuard"); /* INFO: Since Android 15, the symbol names for the linker have a suffix, this makes it impossible to hardcode the symbol names. To allow @@ -131,6 +139,11 @@ namespace SoList { std::string_view solist_sym_name = linker.findSymbolNameByPrefix("__dl__ZL6solist"); if (solist_sym_name.empty()) return false; + LOGD("found symbol name %s", solist_sym_name.data()); + + std::string_view soinfo_free_name = linker.findSymbolNameByPrefix("__dl__ZL11soinfo_freeP6soinfo"); + if (soinfo_free_name.empty()) return false; + LOGD("found symbol name %s", soinfo_free_name.data()); /* INFO: The size isn't a magic number, it's the size for the string: .llvm.7690929523238822858 */ char llvm_sufix[25 + 1]; @@ -143,6 +156,7 @@ namespace SoList { solist = getStaticPointer(linker, solist_sym_name.data()); if (solist == NULL) return false; + LOGD("found symbol solist"); char somain_sym_name[sizeof("__dl__ZL6somain") + sizeof(llvm_sufix)]; snprintf(somain_sym_name, sizeof(somain_sym_name), "__dl__ZL6somain%s", llvm_sufix); @@ -150,30 +164,51 @@ namespace SoList { char sonext_sym_name[sizeof("__dl__ZL6sonext") + sizeof(llvm_sufix)]; snprintf(sonext_sym_name, sizeof(somain_sym_name), "__dl__ZL6sonext%s", llvm_sufix); - char vsdo_sym_name[sizeof("__dl__ZL4vdso") + sizeof(llvm_sufix)]; - snprintf(vsdo_sym_name, sizeof(vsdo_sym_name), "__dl__ZL4vdso%s", llvm_sufix); + char vdso_sym_name[sizeof("__dl__ZL4vdso") + sizeof(llvm_sufix)]; + snprintf(vdso_sym_name, sizeof(vdso_sym_name), "__dl__ZL4vdso%s", llvm_sufix); somain = getStaticPointer(linker, somain_sym_name); if (somain == NULL) return false; + LOGD("found symbol somain"); sonext = linker.getSymbAddress(sonext_sym_name); if (sonext == NULL) return false; + LOGD("found symbol sonext"); - SoInfo *vsdo = getStaticPointer(linker, vsdo_sym_name); - if (vsdo == NULL) return false; + SoInfo *vdso = getStaticPointer(linker, vdso_sym_name); + if (vdso != NULL) { + LOGD("found symbol vdso"); + } else { + LOGD("symbol vdso is missing"); + } SoInfo::get_realpath_sym = reinterpret_cast(linker.getSymbAddress("__dl__ZNK6soinfo12get_realpathEv")); + if (SoInfo::get_realpath_sym == NULL) return false; + LOGD("found symbol get_realpath_sym"); + SoInfo::get_soname_sym = reinterpret_cast(linker.getSymbAddress("__dl__ZNK6soinfo10get_sonameEv")); + if (SoInfo::get_soname_sym == NULL) return false; + LOGD("found symbol get_soname_sym"); + + SoInfo::soinfo_free = reinterpret_cast(linker.getSymbAddress(soinfo_free_name)); + if (SoInfo::soinfo_free == NULL) return false; + LOGD("found symbol soinfo_free"); + for (size_t i = 0; i < 1024 / sizeof(void *); i++) { - auto *possible_next = *(void **) ((uintptr_t) solist + i * sizeof(void *)); - if (possible_next == somain || (vsdo != NULL && possible_next == vsdo)) { + auto possible_field = (uintptr_t) solist + i * sizeof(void *); + auto possible_size_of_somain = *(size_t *)((uintptr_t) somain + i * sizeof(void *)); + if (possible_size_of_somain < 0x100000 && possible_size_of_somain > 0x100) { + SoInfo::solist_size_offset = i * sizeof(void *); + LOGD("solist_size_offset is %zu * %zu = %p", i, sizeof(void *), (void*) SoInfo::solist_size_offset); + } + if (*(void **)possible_field == somain || (vdso != NULL && *(void **)possible_field == vdso)) { SoInfo::solist_next_offset = i * sizeof(void *); - + LOGD("solist_next_offset is %zu * %zu = %p", i, sizeof(void *), (void*) SoInfo::solist_next_offset); break; } } - return (SoInfo::get_realpath_sym != NULL && SoInfo::get_soname_sym != NULL); + return true; } } diff --git a/loader/src/injector/entry.cpp b/loader/src/injector/entry.cpp index 40a71b6..36409aa 100644 --- a/loader/src/injector/entry.cpp +++ b/loader/src/injector/entry.cpp @@ -23,6 +23,7 @@ void entry(void* addr, size_t size, const char* path) { logging::setfd(zygiskd::RequestLogcatFd()); #endif - LOGI("Start hooking, call %p", hook_functions); + LOGI("start plt hooking"); hook_functions(); + clean_trace(path); } diff --git a/loader/src/injector/hook.cpp b/loader/src/injector/hook.cpp index 16bb8d1..4d4f2a8 100644 --- a/loader/src/injector/hook.cpp +++ b/loader/src/injector/hook.cpp @@ -185,14 +185,13 @@ DCL_HOOK_FUNC(int, pthread_attr_setstacksize, void *target, size_t size) { if (gettid() != getpid()) return res; - LOGV("Clean zygisk reminders"); if (should_unmap_zygisk) { unhook_functions(); if (should_unmap_zygisk) { // Because both `pthread_attr_setstacksize` and `dlclose` have the same function signature, // we can use `musttail` to let the compiler reuse our stack frame and thus // `dlclose` will directly return to the caller of `pthread_attr_setstacksize`. - LOGV("Unmap libzygisk.so"); + LOGI("unmap libzygisk.so loaded at %p with size %zu", start_addr, block_size); [[clang::musttail]] return munmap(start_addr, block_size); } } @@ -584,7 +583,7 @@ void ZygiskContext::run_modules_post() { m.tryUnload(); } - SoList::DropSoPath("jit-cache"); + clean_trace("jit-cache"); // Remap as well to avoid checking of /memfd:jit-cache for (auto &info : lsplt::MapInfo::Scan()) { @@ -816,6 +815,11 @@ static void hook_register(dev_t dev, ino_t inode, const char *symbol, void *new_ #define PLT_HOOK_REGISTER(DEV, INODE, NAME) \ PLT_HOOK_REGISTER_SYM(DEV, INODE, #NAME, NAME) +void clean_trace(const char* path) { + LOGD("clean solist trace for path %s", path); + SoList::DropSoPath(path); +} + void hook_functions() { default_new(plt_hook_list); default_new(jni_hook_list); diff --git a/loader/src/injector/zygisk.hpp b/loader/src/injector/zygisk.hpp index 636367b..f704181 100644 --- a/loader/src/injector/zygisk.hpp +++ b/loader/src/injector/zygisk.hpp @@ -7,6 +7,8 @@ extern size_t block_size; void hook_functions(); +void clean_trace(const char* path); + void revert_unmount_ksu(); void revert_unmount_magisk(); From 2814aaf67fc3993394e5b3801a4cf9a2606b63a8 Mon Sep 17 00:00:00 2001 From: JingMatrix Date: Sat, 14 Dec 2024 13:11:03 +0100 Subject: [PATCH 15/46] remove: unnecessary memory mapping renaming Note that it is impossible to hide injecting trace of virtual memory maps from the hooked target process. ReZygisk will only focus on removing its trace for approcess that are not hooked by modules. --- loader/src/include/solist.hpp | 7 ++- loader/src/injector/hook.cpp | 107 +++++++++------------------------ loader/src/injector/zygisk.hpp | 2 +- 3 files changed, 36 insertions(+), 80 deletions(-) diff --git a/loader/src/include/solist.hpp b/loader/src/include/solist.hpp index 77ab4a5..51a4f2e 100644 --- a/loader/src/include/solist.hpp +++ b/loader/src/include/solist.hpp @@ -107,10 +107,11 @@ namespace SoList { return addr == NULL ? NULL : *addr; } - static void DropSoPath(const char* target_path) { + static bool DropSoPath(const char* target_path) { + bool path_found = false; if (solist == NULL && !Initialize()) { LOGE("Failed to initialize solist"); - return; + return path_found; } for (auto iter = solist; iter; iter = iter->get_next()) { if (iter->get_name() && iter->get_path() && strstr(iter->get_path(), target_path)) { @@ -119,9 +120,11 @@ namespace SoList { if (iter->get_size() > 0) { iter->set_size(0); SoInfo::soinfo_free(iter); + path_found = true; } } } + return path_found; } static bool Initialize() { diff --git a/loader/src/injector/hook.cpp b/loader/src/injector/hook.cpp index 4d4f2a8..0c86588 100644 --- a/loader/src/injector/hook.cpp +++ b/loader/src/injector/hook.cpp @@ -583,80 +583,7 @@ void ZygiskContext::run_modules_post() { m.tryUnload(); } - clean_trace("jit-cache"); - - // Remap as well to avoid checking of /memfd:jit-cache - for (auto &info : lsplt::MapInfo::Scan()) { - if (strstr(info.path.c_str(), "jit-cache-zygisk")) - { - void *addr = (void *)info.start; - size_t size = info.end - info.start; - // MAP_SHARED should fix the suspicious mapping. - void *copy = mmap(nullptr, size, PROT_WRITE, MAP_ANONYMOUS | MAP_SHARED, -1, 0); - if (copy == MAP_FAILED) { - LOGE("Failed to mmap jit-cache-zygisk"); - continue; - } - - if ((info.perms & PROT_READ) == 0) { - mprotect(addr, size, PROT_READ); - } - memcpy(copy, addr, size); - mremap(copy, size, size, MREMAP_MAYMOVE | MREMAP_FIXED, addr); - mprotect(addr, size, info.perms); - } - } - - // Don't know if there's a header for things like this - // so I just put it into a lambda - auto generateRandomString = [](char *str, int length) { - const char charset[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; - srand(time(NULL)); - - for (int i = 0; i < length; i++) { - int key = rand() % (sizeof(charset) - 1); - str[i] = charset[key]; - } - - str[length] = '\0'; - }; - - // Randomize name of anonymous mappings - // We don't run this in the previous loop because LSPosed might also add - // mappings that are not related to /memfd:jit-zygisk-cache - // - // Since we changed to MAP_SHARED, I don't think this is still needed but let's - // leave it here just in case. - for (auto info : lsplt::MapInfo::Scan()) { - // I had some problems with info.perms & PROT_EXEC so I had to change lsplt source a bit. - // If that problem occurs here, do strchr(info.perms_str.c_str(), 'x') instead and add perms_str - // to the lsplt MapInfo struct and set it to the raw perms string in Scan(); - if (info.perms & PROT_EXEC && info.path.empty()) { - // Generate Random Name - char randomString[11]; - generateRandomString(randomString, 10); - LOGI("Randomized Memory map name: %s", randomString); - - // Memory address of random string - uintptr_t strAddr = (uintptr_t)&randomString; - - // https://lore.kernel.org/lkml/1383170047-21074-2-git-send-email-ccross@android.com/ - prctl(PR_SET_VMA, PR_SET_VMA_ANON_NAME, info.start, info.end - info.start, strAddr); - } - - // Remap as MAP_SHARED - if (info.perms & PROT_EXEC && info.dev == 0 && info.path.find("anon") != std::string::npos) { - void *addr = reinterpret_cast(info.start); - size_t size = info.end - info.start; - void *copy = mmap(nullptr, size, PROT_WRITE, MAP_ANONYMOUS | MAP_SHARED, -1, 0); - if ((info.perms & PROT_READ) == 0) { - mprotect(addr, size, PROT_READ); - } - memcpy(copy, addr, size); - mremap(copy, size, size, MREMAP_MAYMOVE | MREMAP_FIXED, addr); - mprotect(addr, size, info.perms); - } - } + clean_trace("jit-cache-zygisk", true); } /* Zygisksu changed: Load module fds */ @@ -815,9 +742,35 @@ static void hook_register(dev_t dev, ino_t inode, const char *symbol, void *new_ #define PLT_HOOK_REGISTER(DEV, INODE, NAME) \ PLT_HOOK_REGISTER_SYM(DEV, INODE, #NAME, NAME) -void clean_trace(const char* path) { - LOGD("clean solist trace for path %s", path); - SoList::DropSoPath(path); +void clean_trace(const char* path, bool spoof_maps) { + LOGD("cleaning trace for path %s", path); + + if (!SoList::DropSoPath(path) || !spoof_maps) { + return; + } + + LOGD("spoofing virtual maps for %s", path); + // spoofing map names is futile in Android, we do it simply + // to avoid Zygisk detections based on string comparison + for (auto &info : lsplt::MapInfo::Scan()) { + if (strstr(info.path.c_str(), path)) + { + void *addr = (void *)info.start; + size_t size = info.end - info.start; + void *copy = mmap(nullptr, size, PROT_WRITE, MAP_ANONYMOUS | MAP_SHARED, -1, 0); + if (copy == MAP_FAILED) { + LOGE("failed to backup block %s [%p, %p]", info.path.c_str(), addr, (void*)info.end); + continue; + } + + if ((info.perms & PROT_READ) == 0) { + mprotect(addr, size, PROT_READ); + } + memcpy(copy, addr, size); + mremap(copy, size, size, MREMAP_MAYMOVE | MREMAP_FIXED, addr); + mprotect(addr, size, info.perms); + } + } } void hook_functions() { diff --git a/loader/src/injector/zygisk.hpp b/loader/src/injector/zygisk.hpp index f704181..744755e 100644 --- a/loader/src/injector/zygisk.hpp +++ b/loader/src/injector/zygisk.hpp @@ -7,7 +7,7 @@ extern size_t block_size; void hook_functions(); -void clean_trace(const char* path); +void clean_trace(const char* path, bool spoof_maps = false); void revert_unmount_ksu(); From 5e072bd919d6c2b38d31359762c500a05c48f87b Mon Sep 17 00:00:00 2001 From: JingMatrix Date: Sun, 15 Dec 2024 01:05:23 +0100 Subject: [PATCH 16/46] improve: cache scanned virtual maps Reading the file `/proc/self/maps` is detectable by the target process. Hence, we should cache scanned virtual maps after `libart.so` is loaded for later plt hooks in the target process. --- .gitmodules | 2 +- loader/src/external/lsplt | 2 +- loader/src/injector/hook.cpp | 41 +++++++++++++++++++++++------------- 3 files changed, 28 insertions(+), 17 deletions(-) diff --git a/.gitmodules b/.gitmodules index 340c732..e46b92c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "loader/src/external/lsplt"] path = loader/src/external/lsplt - url = https://github.com/LSPosed/lsplt + url = https://github.com/JingMatrix/LSPlt diff --git a/loader/src/external/lsplt b/loader/src/external/lsplt index 5d2b820..9848042 160000 --- a/loader/src/external/lsplt +++ b/loader/src/external/lsplt @@ -1 +1 @@ -Subproject commit 5d2b820cf968fcd8162697d208ad406805b6db25 +Subproject commit 984804293e6f7f87604479fefd57976a2c222a89 diff --git a/loader/src/injector/hook.cpp b/loader/src/injector/hook.cpp index 0c86588..ef0ad6a 100644 --- a/loader/src/injector/hook.cpp +++ b/loader/src/injector/hook.cpp @@ -122,6 +122,7 @@ struct ZygiskContext { vector> *plt_hook_list; map, StringCmp> *jni_hook_list; bool should_unmap_zygisk = false; +std::vector cached_map_infos = {}; } // namespace @@ -187,6 +188,7 @@ DCL_HOOK_FUNC(int, pthread_attr_setstacksize, void *target, size_t size) { if (should_unmap_zygisk) { unhook_functions(); + cached_map_infos.clear(); if (should_unmap_zygisk) { // Because both `pthread_attr_setstacksize` and `dlclose` have the same function signature, // we can use `musttail` to let the compiler reuse our stack frame and thus @@ -205,6 +207,8 @@ DCL_HOOK_FUNC(char *, strdup, const char *s) { if (strcmp(s, "com.android.internal.os.ZygoteInit") == 0) { LOGV("strdup %s", s); initialize_jni_hook(); + cached_map_infos = lsplt::MapInfo::Scan(); + LOGD("cached_map_infos updated"); } return old_strdup(s); @@ -268,7 +272,7 @@ void initialize_jni_hook() { auto get_created_java_vms = reinterpret_cast( dlsym(RTLD_DEFAULT, "JNI_GetCreatedJavaVMs")); if (!get_created_java_vms) { - for (auto &map: lsplt::MapInfo::Scan()) { + for (auto &map: cached_map_infos) { if (!map.path.ends_with("/libnativehelper.so")) continue; void *h = dlopen(map.path.data(), RTLD_LAZY); if (!h) { @@ -349,7 +353,7 @@ bool ZygiskModule::RegisterModuleImpl(ApiTable *api, long *module) { api->v2.getFlags = [](auto) { return ZygiskModule::getFlags(); }; } if (api_version >= 4) { - api->v4.pltHookCommit = lsplt::CommitHook; + api->v4.pltHookCommit = []() { return lsplt::CommitHook(cached_map_infos); }; api->v4.pltHookRegister = [](dev_t dev, ino_t inode, const char *symbol, void *fn, void **backup) { if (dev == 0 || inode == 0 || symbol == nullptr || fn == nullptr) return; @@ -383,7 +387,7 @@ void ZygiskContext::plt_hook_exclude(const char *regex, const char *symbol) { void ZygiskContext::plt_hook_process_regex() { if (register_info.empty()) return; - for (auto &map : lsplt::MapInfo::Scan()) { + for (auto &map : cached_map_infos) { if (map.offset != 0 || !map.is_private || !(map.perms & PROT_READ)) continue; for (auto ®: register_info) { if (regexec(®.regex, map.path.data(), 0, nullptr, 0) != 0) @@ -411,7 +415,7 @@ bool ZygiskContext::plt_hook_commit() { register_info.clear(); ignore_info.clear(); } - return lsplt::CommitHook(); + return lsplt::CommitHook(cached_map_infos); } @@ -719,8 +723,8 @@ ZygiskContext::~ZygiskContext() { } // namespace -static bool hook_commit() { - if (lsplt::CommitHook()) { +static bool hook_commit(std::vector &map_infos = cached_map_infos) { + if (lsplt::CommitHook(map_infos)) { return true; } else { LOGE("plt_hook failed"); @@ -752,23 +756,23 @@ void clean_trace(const char* path, bool spoof_maps) { LOGD("spoofing virtual maps for %s", path); // spoofing map names is futile in Android, we do it simply // to avoid Zygisk detections based on string comparison - for (auto &info : lsplt::MapInfo::Scan()) { - if (strstr(info.path.c_str(), path)) + for (auto &map : lsplt::MapInfo::Scan()) { + if (strstr(map.path.c_str(), path)) { - void *addr = (void *)info.start; - size_t size = info.end - info.start; + void *addr = (void *)map.start; + size_t size = map.end - map.start; void *copy = mmap(nullptr, size, PROT_WRITE, MAP_ANONYMOUS | MAP_SHARED, -1, 0); if (copy == MAP_FAILED) { - LOGE("failed to backup block %s [%p, %p]", info.path.c_str(), addr, (void*)info.end); + LOGE("failed to backup block %s [%p, %p]", map.path.c_str(), addr, (void*)map.end); continue; } - if ((info.perms & PROT_READ) == 0) { + if ((map.perms & PROT_READ) == 0) { mprotect(addr, size, PROT_READ); } memcpy(copy, addr, size); mremap(copy, size, size, MREMAP_MAYMOVE | MREMAP_FIXED, addr); - mprotect(addr, size, info.perms); + mprotect(addr, size, map.perms); } } } @@ -783,7 +787,8 @@ void hook_functions() { // ino_t native_bridge_inode = 0; // dev_t native_bridge_dev = 0; - for (auto &map : lsplt::MapInfo::Scan()) { + cached_map_infos = lsplt::MapInfo::Scan(); + for (auto &map : cached_map_infos) { if (map.path.ends_with("libandroid_runtime.so")) { android_runtime_inode = map.inode; android_runtime_dev = map.dev; @@ -809,7 +814,7 @@ static void hook_unloader() { ino_t art_inode = 0; dev_t art_dev = 0; - for (auto &map : lsplt::MapInfo::Scan()) { + for (auto &map : cached_map_infos) { if (map.path.ends_with("/libart.so")) { art_inode = map.inode; art_dev = map.dev; @@ -817,6 +822,12 @@ static void hook_unloader() { } } + if (art_dev == 0 || art_inode == 0) { + LOGE("virtual map for libart.so is not cached"); + return; + } else { + LOGD("hook_unloader called with libart.so [%zu:%lu]", art_dev, art_inode); + } PLT_HOOK_REGISTER(art_dev, art_inode, pthread_attr_setstacksize); hook_commit(); } From 0671f2e497140e40071f67e67481541def4258bb Mon Sep 17 00:00:00 2001 From: JingMatrix Date: Mon, 16 Dec 2024 10:08:09 +0100 Subject: [PATCH 17/46] improve: reset linker module counters Two counters for module loading and unloading are introduced in the commit https://cs.android.com/android/_/android/platform/bionic/+/a2e83ab34845759f0999d0ec88f4cdf558c0a9f5. To remove linker traces of libzygisk.so and Zygisk modules, we should reset them properly. --- loader/src/include/solist.hpp | 35 +++++++++++++++++++++++++++++----- loader/src/injector/entry.cpp | 2 +- loader/src/injector/hook.cpp | 17 +++++++++++------ loader/src/injector/module.hpp | 5 +++-- loader/src/injector/zygisk.hpp | 2 +- 5 files changed, 46 insertions(+), 15 deletions(-) diff --git a/loader/src/include/solist.hpp b/loader/src/include/solist.hpp index 51a4f2e..f55d4b1 100644 --- a/loader/src/include/solist.hpp +++ b/loader/src/include/solist.hpp @@ -98,6 +98,9 @@ namespace SoList { static SoInfo *somain = NULL; static SoInfo **sonext = NULL; + static uint64_t *g_module_load_counter = NULL; + static uint64_t *g_module_unload_counter = NULL; + static bool Initialize(); template @@ -127,6 +130,27 @@ namespace SoList { return path_found; } + static void ResetCounters(size_t load, size_t unload) { + if (solist == NULL && !Initialize()) { + LOGE("Failed to initialize solist"); + return; + } + if (g_module_load_counter == NULL || g_module_unload_counter == NULL) { + LOGI("g_module counters not defined, skip reseting them"); + return; + } + auto loaded_modules = *g_module_load_counter; + auto unloaded_modules = *g_module_unload_counter; + if (loaded_modules >= load) { + *g_module_load_counter = loaded_modules - load; + LOGD("reset g_module_load_counter to %zu", (size_t) *g_module_load_counter); + } + if (unloaded_modules >= unload) { + *g_module_unload_counter = unloaded_modules - unload; + LOGD("reset g_module_unload_counter to %zu", (size_t) *g_module_unload_counter); + } + } + static bool Initialize() { SandHook::ElfImg linker("/linker"); if (!ProtectedDataGuard::setup(linker)) return false; @@ -179,11 +203,7 @@ namespace SoList { LOGD("found symbol sonext"); SoInfo *vdso = getStaticPointer(linker, vdso_sym_name); - if (vdso != NULL) { - LOGD("found symbol vdso"); - } else { - LOGD("symbol vdso is missing"); - } + if (vdso != NULL) LOGD("found symbol vdso"); SoInfo::get_realpath_sym = reinterpret_cast(linker.getSymbAddress("__dl__ZNK6soinfo12get_realpathEv")); if (SoInfo::get_realpath_sym == NULL) return false; @@ -197,6 +217,11 @@ namespace SoList { if (SoInfo::soinfo_free == NULL) return false; LOGD("found symbol soinfo_free"); + g_module_load_counter = reinterpret_cast(linker.getSymbAddress("__dl__ZL21g_module_load_counter")); + if (g_module_load_counter != NULL) LOGD("found symbol g_module_load_counter"); + + g_module_unload_counter = reinterpret_cast(linker.getSymbAddress("__dl__ZL23g_module_unload_counter")); + if (g_module_unload_counter != NULL) LOGD("found symbol g_module_unload_counter"); for (size_t i = 0; i < 1024 / sizeof(void *); i++) { auto possible_field = (uintptr_t) solist + i * sizeof(void *); diff --git a/loader/src/injector/entry.cpp b/loader/src/injector/entry.cpp index 36409aa..a927042 100644 --- a/loader/src/injector/entry.cpp +++ b/loader/src/injector/entry.cpp @@ -25,5 +25,5 @@ void entry(void* addr, size_t size, const char* path) { LOGI("start plt hooking"); hook_functions(); - clean_trace(path); + clean_trace(path, 1, 0, false); } diff --git a/loader/src/injector/hook.cpp b/loader/src/injector/hook.cpp index ef0ad6a..ae41b6a 100644 --- a/loader/src/injector/hook.cpp +++ b/loader/src/injector/hook.cpp @@ -578,16 +578,21 @@ void ZygiskContext::run_modules_pre() { void ZygiskContext::run_modules_post() { flags[POST_SPECIALIZE] = true; + + size_t modules_unloaded = 0; for (const auto &m : modules) { if (flags[APP_SPECIALIZE]) { m.postAppSpecialize(args.app); } else if (flags[SERVER_FORK_AND_SPECIALIZE]) { m.postServerSpecialize(args.server); } - m.tryUnload(); + if (m.tryUnload()) modules_unloaded++; } - clean_trace("jit-cache-zygisk", true); + if (modules.size() > 0) { + LOGD("modules unloaded: %zu/%zu", modules_unloaded, modules.size()); + clean_trace("jit-cache-zygisk", modules.size(), modules_unloaded, true); + } } /* Zygisksu changed: Load module fds */ @@ -746,12 +751,12 @@ static void hook_register(dev_t dev, ino_t inode, const char *symbol, void *new_ #define PLT_HOOK_REGISTER(DEV, INODE, NAME) \ PLT_HOOK_REGISTER_SYM(DEV, INODE, #NAME, NAME) -void clean_trace(const char* path, bool spoof_maps) { +void clean_trace(const char* path, size_t load, size_t unload, bool spoof_maps) { LOGD("cleaning trace for path %s", path); - if (!SoList::DropSoPath(path) || !spoof_maps) { - return; - } + if (load > 0 || unload >0) SoList::ResetCounters(load, unload); + bool path_found = SoList::DropSoPath(path); + if (!path_found || !spoof_maps) return; LOGD("spoofing virtual maps for %s", path); // spoofing map names is futile in Android, we do it simply diff --git a/loader/src/injector/module.hpp b/loader/src/injector/module.hpp index dfbde57..24111fc 100644 --- a/loader/src/injector/module.hpp +++ b/loader/src/injector/module.hpp @@ -1,5 +1,6 @@ #pragma once +#include #include #include "api.hpp" @@ -209,7 +210,7 @@ case 5: \ int getModuleDir() const; void setOption(zygisk::Option opt); static uint32_t getFlags(); - void tryUnload() const { if (unload) dlclose(handle); } + bool tryUnload() const { return unload && dlclose(handle) == 0; }; void clearApi() { memset(&api, 0, sizeof(api)); } int getId() const { return id; } @@ -235,4 +236,4 @@ case 5: \ } mod; }; -} // namespace \ No newline at end of file +} // namespace diff --git a/loader/src/injector/zygisk.hpp b/loader/src/injector/zygisk.hpp index 744755e..793ba78 100644 --- a/loader/src/injector/zygisk.hpp +++ b/loader/src/injector/zygisk.hpp @@ -7,7 +7,7 @@ extern size_t block_size; void hook_functions(); -void clean_trace(const char* path, bool spoof_maps = false); +void clean_trace(const char* path, size_t load = 1, size_t unload = 0, bool spoof_maps = false); void revert_unmount_ksu(); From 95073d9f4a61317295309f24e1843f6b9605ef66 Mon Sep 17 00:00:00 2001 From: ThePedroo Date: Wed, 18 Dec 2024 13:07:06 -0300 Subject: [PATCH 18/46] fix: checking `malloc` against non `NULL` not `NULL` This commit fixes an issue where one of the "malloc", a libc function to allocate dynamic memory, "if"s were checking its return against non-NULL instead of NULL, making it seem to have failed when it didn't. --- loader/src/ptracer/monitor.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/loader/src/ptracer/monitor.cpp b/loader/src/ptracer/monitor.cpp index 36f4bdc..af7f28c 100644 --- a/loader/src/ptracer/monitor.cpp +++ b/loader/src/ptracer/monitor.cpp @@ -270,13 +270,13 @@ struct SocketHandler : public EventHandler { LOGD("received daemon64 info %s", msg->data); /* Will only happen if somehow the daemon restarts */ - if (status64.daemon_info != NULL) { + if (status64.daemon_info) { free(status64.daemon_info); status64.daemon_info = NULL; } status64.daemon_info = (char *)malloc(msg->length); - if (status64.daemon_info == NULL) { + if (!status64.daemon_info) { PLOGE("malloc daemon64 info"); break; @@ -291,13 +291,13 @@ struct SocketHandler : public EventHandler { case DAEMON32_SET_INFO: { LOGD("received daemon32 info %s", msg->data); - if (status32.daemon_info != NULL) { + if (status32.daemon_info) { free(status32.daemon_info); status32.daemon_info = NULL; } status32.daemon_info = (char *)malloc(msg->length); - if (status32.daemon_info == NULL) { + if (!status32.daemon_info) { PLOGE("malloc daemon32 info"); break; @@ -314,13 +314,13 @@ struct SocketHandler : public EventHandler { status64.daemon_running = false; - if (status64.daemon_error_info != NULL) { + if (status64.daemon_error_info) { free(status64.daemon_error_info); status64.daemon_error_info = NULL; } status64.daemon_error_info = (char *)malloc(msg->length); - if (status64.daemon_error_info == NULL) { + if (!status64.daemon_error_info) { PLOGE("malloc daemon64 error info"); break; @@ -337,13 +337,13 @@ struct SocketHandler : public EventHandler { status32.daemon_running = false; - if (status32.daemon_error_info != NULL) { + if (status32.daemon_error_info) { free(status32.daemon_error_info); status32.daemon_error_info = NULL; } status32.daemon_error_info = (char *)malloc(msg->length); - if (status32.daemon_error_info == NULL) { + if (!status32.daemon_error_info) { PLOGE("malloc daemon32 error info"); break; @@ -447,7 +447,7 @@ static bool ensure_daemon_created(bool is_64bit) { \ if (!status##abi.daemon_error_info) { \ status##abi.daemon_error_info = (char *)malloc(strlen(status_str) + 1); \ - if (status##abi.daemon_error_info) { \ + if (!status##abi.daemon_error_info) { \ LOGE("malloc daemon" #abi " error info failed"); \ \ return; \ @@ -800,10 +800,10 @@ void init_monitor() { looper.RegisterHandler(ptraceHandler, EPOLLIN | EPOLLET); looper.Loop(); - if (status64.daemon_info != NULL) free(status64.daemon_info); - if (status64.daemon_error_info != NULL) free(status64.daemon_error_info); - if (status32.daemon_info != NULL) free(status32.daemon_info); - if (status32.daemon_error_info != NULL) free(status32.daemon_error_info); + if (status64.daemon_info) free(status64.daemon_info); + if (status64.daemon_error_info) free(status64.daemon_error_info); + if (status32.daemon_info) free(status32.daemon_info); + if (status32.daemon_error_info) free(status32.daemon_error_info); LOGI("exit"); } From 6b0b71a690a47a6720faaf885e085618fed1af3d Mon Sep 17 00:00:00 2001 From: ThePedroo Date: Sat, 21 Dec 2024 16:46:36 -0300 Subject: [PATCH 19/46] fix: Zygiskd remote read types This commit fixes the mismatch between types sent by lizygisk.so and read by Zygiskd, causing issues. --- zygiskd/build.gradle.kts | 2 +- zygiskd/src/companion.c | 42 ++++++++++++++++++++++++++------ zygiskd/src/constants.h | 18 +++++++------- zygiskd/src/root_impl/apatch.c | 2 +- zygiskd/src/root_impl/kernelsu.c | 6 ++--- zygiskd/src/utils.c | 5 +--- zygiskd/src/utils.h | 3 --- zygiskd/src/zygiskd.c | 37 ++++++++++++++-------------- 8 files changed, 68 insertions(+), 47 deletions(-) diff --git a/zygiskd/build.gradle.kts b/zygiskd/build.gradle.kts index 033cb8a..b830189 100644 --- a/zygiskd/build.gradle.kts +++ b/zygiskd/build.gradle.kts @@ -29,7 +29,7 @@ val commitHash: String by rootProject.extra val CStandardFlags = arrayOf( "-D_GNU_SOURCE", "-std=c99", "-Wpedantic", "-Wall", "-Wextra", "-Werror", "-Wformat", "-Wuninitialized", "-Wshadow", "-Wno-zero-length-array", - "-Wno-fixed-enum-extension", "-Iroot_impl", "-llog", + "-Wconversion", "-Wno-fixed-enum-extension", "-Iroot_impl", "-llog", "-DMIN_APATCH_VERSION=$minAPatchVersion", "-DMIN_KSU_VERSION=$minKsuVersion", "-DMAX_KSU_VERSION=$maxKsuVersion", diff --git a/zygiskd/src/companion.c b/zygiskd/src/companion.c index 486b6fa..ee54945 100644 --- a/zygiskd/src/companion.c +++ b/zygiskd/src/companion.c @@ -31,8 +31,7 @@ zygisk_companion_entry_func load_module(int fd) { void *handle = android_dlopen(path, RTLD_NOW); void *entry = dlsym(handle, "zygisk_companion_entry"); - if (entry == NULL) return NULL; - + return (zygisk_companion_entry_func)entry; } @@ -42,12 +41,37 @@ void *entry_thread(void *arg) { int fd = args->fd; zygisk_companion_entry_func module_entry = args->entry; + struct stat st0; + if (fstat(fd, &st0) == -1) { + LOGE("Failed to get client fd stats\n"); + + close(fd); + free(args); + + pthread_exit(NULL); + } + module_entry(fd); - close(fd); + struct stat st1; + if (fstat(fd, &st1) == -1) { + LOGE("Failed to get client fd stats\n"); + + close(fd); + free(args); + + pthread_exit(NULL); + } + + if (st0.st_dev != st1.st_dev || st0.st_ino != st1.st_ino) { + LOGI("Client fd changed. Closing.\n"); + + close(fd); + } + free(args); - pthread_exit(NULL); + return NULL; } /* WARNING: Dynamic memory based */ @@ -67,7 +91,7 @@ void companion_entry(int fd) { } name[name_length] = '\0'; - LOGI(" - Module name: `%.*s`\n", (int)name_length, name); + LOGI(" - Module name: \"%s\"\n", name); int library_fd = read_fd(fd); ssize_t ret = 0; @@ -86,7 +110,7 @@ void companion_entry(int fd) { close(library_fd); if (module_entry == NULL) { - LOGI("No companion module entry for module: %.*s\n", (int)name_length, name); + LOGE("No companion module entry for module: %s\n", name); ret = write_uint8_t(fd, 0); ASSURE_SIZE_WRITE("ZygiskdCompanion", "module_entry", ret, sizeof(uint8_t)); @@ -99,7 +123,7 @@ void companion_entry(int fd) { while (1) { if (!check_unix_socket(fd, true)) { - LOGI("Something went wrong in companion. Bye!\n"); + LOGE("Something went wrong in companion. Bye!\n"); exit(0); @@ -117,13 +141,15 @@ void companion_entry(int fd) { if (args == NULL) { LOGE("Failed to allocate memory for thread args\n"); + close(client_fd); + exit(0); } args->fd = client_fd; args->entry = module_entry; - LOGI("New companion request.\n - Module name: %.*s\n - Client fd: %d\n", (int)name_length, name, args->fd); + LOGI("New companion request.\n - Module name: %s\n - Client fd: %d\n", name, args->fd); ret = write_uint8_t(args->fd, 1); ASSURE_SIZE_WRITE("ZygiskdCompanion", "client_fd", ret, sizeof(uint8_t)); diff --git a/zygiskd/src/constants.h b/zygiskd/src/constants.h index 55f8a56..8342ebb 100644 --- a/zygiskd/src/constants.h +++ b/zygiskd/src/constants.h @@ -25,15 +25,15 @@ #define SYSTEM_SERVER_STARTED 10 enum DaemonSocketAction { - PingHeartbeat, - RequestLogcatFd, - GetProcessFlags, - GetInfo, - ReadModules, - RequestCompanionSocket, - GetModuleDir, - ZygoteRestart, - SystemServerStarted + PingHeartbeat = 0, + RequestLogcatFd = 1, + GetProcessFlags = 2, + GetInfo = 3, + ReadModules = 4, + RequestCompanionSocket = 5, + GetModuleDir = 6, + ZygoteRestart = 7, + SystemServerStarted = 8 }; enum ProcessFlags: uint32_t { diff --git a/zygiskd/src/root_impl/apatch.c b/zygiskd/src/root_impl/apatch.c index fadac60..f899038 100644 --- a/zygiskd/src/root_impl/apatch.c +++ b/zygiskd/src/root_impl/apatch.c @@ -115,7 +115,7 @@ bool _apatch_get_package_config(struct packages_config *restrict config) { char *uid_str = strtok(NULL, ","); if (uid_str == NULL) continue; - config->configs[config->size].uid = atoi(uid_str); + config->configs[config->size].uid = (uid_t)atoi(uid_str); config->configs[config->size].root_granted = strcmp(allow_str, "1") == 0; config->configs[config->size].umount_needed = strcmp(exclude_str, "1") == 0; diff --git a/zygiskd/src/root_impl/kernelsu.c b/zygiskd/src/root_impl/kernelsu.c index 775b1c6..f9f0968 100644 --- a/zygiskd/src/root_impl/kernelsu.c +++ b/zygiskd/src/root_impl/kernelsu.c @@ -14,7 +14,7 @@ so we need to cast it to signed int to avoid any potential UB. */ -#define KERNEL_SU_OPTION 0xdeadbeef +#define KERNEL_SU_OPTION (int)0xdeadbeef #define CMD_GET_VERSION 2 #define CMD_UID_GRANTED_ROOT 12 @@ -52,7 +52,7 @@ bool ksu_uid_granted_root(uid_t uid) { bool granted = false; prctl(KERNEL_SU_OPTION, CMD_UID_GRANTED_ROOT, uid, &granted, &result); - if (result != KERNEL_SU_OPTION) return false; + if ((int)result != KERNEL_SU_OPTION) return false; return granted; } @@ -62,7 +62,7 @@ bool ksu_uid_should_umount(uid_t uid) { bool umount = false; prctl(KERNEL_SU_OPTION, CMD_UID_SHOULD_UMOUNT, uid, &umount, &result); - if (result != KERNEL_SU_OPTION) return false; + if ((int)result != KERNEL_SU_OPTION) return false; return umount; } diff --git a/zygiskd/src/utils.c b/zygiskd/src/utils.c index 88314b9..2285844 100644 --- a/zygiskd/src/utils.c +++ b/zygiskd/src/utils.c @@ -272,9 +272,6 @@ int read_fd(int fd) { return read(fd, val, sizeof(type)); \ } -write_func(int) -read_func(int) - write_func(size_t) read_func(size_t) @@ -365,7 +362,7 @@ bool exec_command(char *restrict buf, size_t len, const char *restrict file, cha } else { close(link[1]); - int nbytes = read(link[0], buf, len); + ssize_t nbytes = read(link[0], buf, len); if (nbytes > 0) buf[nbytes - 1] = '\0'; /* INFO: If something went wrong, at least we must ensure it is NULL-terminated */ else buf[0] = '\0'; diff --git a/zygiskd/src/utils.h b/zygiskd/src/utils.h index c7f7a99..f5f6372 100644 --- a/zygiskd/src/utils.h +++ b/zygiskd/src/utils.h @@ -80,9 +80,6 @@ int unix_listener_from_path(char *path); ssize_t write_fd(int fd, int sendfd); int read_fd(int fd); -write_func_def(int); -read_func_def(int); - write_func_def(size_t); read_func_def(size_t); diff --git a/zygiskd/src/zygiskd.c b/zygiskd/src/zygiskd.c index dcb88d8..702bf90 100644 --- a/zygiskd/src/zygiskd.c +++ b/zygiskd/src/zygiskd.c @@ -30,7 +30,7 @@ struct Module { struct Context { struct Module *modules; - int len; + size_t len; }; enum Architecture { @@ -85,14 +85,14 @@ int create_library_fd(const char *restrict so_path) { /* INFO: This is required as older implementations of glibc may not have the memfd_create function call, causing a crash. */ - int memfd = syscall(SYS_memfd_create, "jit-cache-zygisk", MFD_ALLOW_SEALING); + int memfd = (int)syscall(SYS_memfd_create, "jit-cache-zygisk", MFD_ALLOW_SEALING); if (memfd == -1) { LOGE("Failed creating memfd: %s\n", strerror(errno)); return -1; } - if (sendfile(memfd, so_fd, NULL, so_size) == -1) { + if (sendfile(memfd, so_fd, NULL, (size_t)so_size) == -1) { LOGE("Failed copying so file to memfd: %s\n", strerror(errno)); close(so_fd); @@ -174,7 +174,7 @@ static void load_modules(enum Architecture arch, struct Context *restrict contex } - context->modules = realloc(context->modules, ((context->len + 1) * sizeof(struct Module))); + context->modules = realloc(context->modules, (size_t)((context->len + 1) * sizeof(struct Module))); if (context->modules == NULL) { LOGE("Failed reallocating memory for modules.\n"); @@ -189,7 +189,7 @@ static void load_modules(enum Architecture arch, struct Context *restrict contex } static void free_modules(struct Context *restrict context) { - for (int i = 0; i < context->len; i++) { + for (size_t i = 0; i < context->len; i++) { free(context->modules[i].name); if (context->modules[i].companion != -1) close(context->modules[i].companion); } @@ -344,7 +344,7 @@ void zygiskd_start(char *restrict argv[]) { msg->length = sprintf(msg->data, "Unsupported environment: Multiple root implementations found"); } - unix_datagram_sendto(CONTROLLER_SOCKET, (void *)msg, sizeof(struct MsgHead) + msg->length); + unix_datagram_sendto(CONTROLLER_SOCKET, (void *)msg, (size_t)((int)sizeof(struct MsgHead) + msg->length)); free(msg); } else { @@ -357,7 +357,7 @@ void zygiskd_start(char *restrict argv[]) { module_list = strdup("None"); module_list_len = strlen("None"); } else { - for (int i = 0; i < context.len; i++) { + for (size_t i = 0; i < context.len; i++) { if (i != context.len - 1) { module_list = realloc(module_list, module_list_len + strlen(context.modules[i].name) + strlen(", ") + 1); if (module_list == NULL) { @@ -397,7 +397,7 @@ void zygiskd_start(char *restrict argv[]) { msg->length = snprintf(msg->data, msg_length, "Root: %s, Modules: %s", impl_name, module_list) + 1; msg->cmd = DAEMON_SET_INFO; - unix_datagram_sendto(CONTROLLER_SOCKET, (void *)msg, sizeof(struct MsgHead) + msg->length); + unix_datagram_sendto(CONTROLLER_SOCKET, (void *)msg, (size_t)((int)sizeof(struct MsgHead) + msg->length)); free(msg); free(module_list); @@ -440,7 +440,7 @@ void zygiskd_start(char *restrict argv[]) { break; } case ZygoteRestart: { - for (int i = 0; i < context.len; i++) { + for (size_t i = 0; i < context.len; i++) { if (context.modules[i].companion != -1) { close(context.modules[i].companion); context.modules[i].companion = -1; @@ -534,7 +534,7 @@ void zygiskd_start(char *restrict argv[]) { } } - ret = write_int(client_fd, flags); + ret = write_uint32_t(client_fd, flags); ASSURE_SIZE_WRITE_BREAK("GetProcessFlags", "flags", ret, sizeof(flags)); break; @@ -562,10 +562,11 @@ void zygiskd_start(char *restrict argv[]) { } } - ssize_t ret = write_size_t(client_fd, flags); + ssize_t ret = write_uint32_t(client_fd, flags); ASSURE_SIZE_WRITE_BREAK("GetInfo", "flags", ret, sizeof(flags)); - uint32_t pid = getpid(); + /* TODO: Use pid_t */ + uint32_t pid = (uint32_t)getpid(); ret = write_uint32_t(client_fd, pid); ASSURE_SIZE_WRITE_BREAK("GetInfo", "pid", ret, sizeof(pid)); @@ -612,10 +613,8 @@ void zygiskd_start(char *restrict argv[]) { struct Module *module = &context.modules[index]; if (module->companion != -1) { - LOGI(" - Polling companion for module \"%s\"\n", module->name); - if (!check_unix_socket(module->companion, false)) { - LOGE(" - Poll companion for module \"%s\" crashed\n", module->name); + LOGE(" - Companion for module \"%s\" crashed\n", module->name); close(module->companion); module->companion = -1; @@ -626,7 +625,7 @@ void zygiskd_start(char *restrict argv[]) { module->companion = spawn_companion(argv, module->name, module->lib_fd); if (module->companion > 0) { - LOGI(" - Spawned companion for \"%s\"\n", module->name); + LOGI(" - Spawned companion for \"%s\": %d\n", module->name, module->companion); } else { if (module->companion == -2) { LOGE(" - No companion spawned for \"%s\" because it has no entry.\n", module->name); @@ -654,14 +653,16 @@ void zygiskd_start(char *restrict argv[]) { close(module->companion); module->companion = -1; - /* INFO: RequestCompanionSocket by defailt doesn't close the client_fd */ + /* INFO: RequestCompanionSocket by default doesn't close the client_fd */ close(client_fd); } } else { + LOGE(" - Failed to spawn companion for module \"%s\"\n", module->name); + ret = write_uint8_t(client_fd, 0); ASSURE_SIZE_WRITE_BREAK("RequestCompanionSocket", "response", ret, sizeof(int)); - /* INFO: RequestCompanionSocket by defailt doesn't close the client_fd */ + /* INFO: RequestCompanionSocket by default doesn't close the client_fd */ close(client_fd); } From 7a892e0d62f0dea4e484ccc673b48f4ce9b05d12 Mon Sep 17 00:00:00 2001 From: ThePedroo Date: Sun, 22 Dec 2024 14:57:39 -0300 Subject: [PATCH 20/46] improve: `companion.c`, `dl.c` and `utils.c` code This commit improves the code for multiple files by making "read_string" function already make the string NULL-terminated, avoiding code duplication. Also for "companion.c" fixes an "if" where it would read "client_fd" and check if "fd" is equal to "-1", instead of "client_fd", also does some overall code improvements there like detaching the thread, avoiding memory leaks in the exit, of the thread itself. --- zygiskd/src/companion.c | 79 ++++++++++++++++++++--------------------- zygiskd/src/dl.c | 7 ++-- zygiskd/src/utils.c | 27 +++++++------- zygiskd/src/utils.h | 2 +- zygiskd/src/zygiskd.c | 11 +++--- 5 files changed, 59 insertions(+), 67 deletions(-) diff --git a/zygiskd/src/companion.c b/zygiskd/src/companion.c index ee54945..0646a77 100644 --- a/zygiskd/src/companion.c +++ b/zygiskd/src/companion.c @@ -14,59 +14,56 @@ #include -#include "companion.h" #include "dl.h" #include "utils.h" -typedef void (*zygisk_companion_entry_func)(int); +typedef void (*zygisk_companion_entry)(int); struct companion_module_thread_args { int fd; - zygisk_companion_entry_func entry; + zygisk_companion_entry entry; }; -zygisk_companion_entry_func load_module(int fd) { +zygisk_companion_entry load_module(int fd) { char path[PATH_MAX]; snprintf(path, sizeof(path), "/proc/self/fd/%d", fd); void *handle = android_dlopen(path, RTLD_NOW); void *entry = dlsym(handle, "zygisk_companion_entry"); - - return (zygisk_companion_entry_func)entry; + + return (zygisk_companion_entry)entry; } void *entry_thread(void *arg) { struct companion_module_thread_args *args = (struct companion_module_thread_args *)arg; int fd = args->fd; - zygisk_companion_entry_func module_entry = args->entry; + zygisk_companion_entry module_entry = args->entry; - struct stat st0; + struct stat st0 = { 0 }; if (fstat(fd, &st0) == -1) { - LOGE("Failed to get client fd stats\n"); + LOGE("Failed to get initial client fd stats: %s\n", strerror(errno)); - close(fd); free(args); - pthread_exit(NULL); + return NULL; } module_entry(fd); + /* INFO: Only attempt to close the client fd if it appears to be the same file + and if we can successfully stat it again. This prevents double closes + if the module companion already closed the fd. + */ struct stat st1; - if (fstat(fd, &st1) == -1) { - LOGE("Failed to get client fd stats\n"); + if (fstat(fd, &st1) == 0) { + if (st0.st_dev == st1.st_dev && st0.st_ino == st1.st_ino) { + LOGI("Client fd stats unchanged. Closing.\n"); - close(fd); - free(args); - - pthread_exit(NULL); - } - - if (st0.st_dev != st1.st_dev || st0.st_ino != st1.st_ino) { - LOGI("Client fd changed. Closing.\n"); - - close(fd); + close(fd); + } else { + LOGI("Client fd stats changed, assuming module handled closing.\n"); + } } free(args); @@ -78,45 +75,44 @@ void *entry_thread(void *arg) { void companion_entry(int fd) { LOGI("New companion entry.\n - Client fd: %d\n", fd); - /* TODO: Use non-NULL string termination */ char name[256 + 1]; - ssize_t name_length = read_string(fd, name, sizeof(name) - 1); - if (name_length == -1) { + ssize_t ret = read_string(fd, name, sizeof(name)); + if (ret == -1) { LOGE("Failed to read module name\n"); - ssize_t ret = write_uint8_t(fd, 2); - ASSURE_SIZE_WRITE("ZygiskdCompanion", "name", ret, sizeof(uint8_t)); + /* TODO: Is that appropriate? */ + close(fd); exit(0); } - name[name_length] = '\0'; LOGI(" - Module name: \"%s\"\n", name); int library_fd = read_fd(fd); - ssize_t ret = 0; if (library_fd == -1) { LOGE("Failed to receive library fd\n"); - ret = write_uint8_t(fd, 2); - ASSURE_SIZE_WRITE("ZygiskdCompanion", "library_fd", ret, sizeof(uint8_t)); + /* TODO: Is that appropriate? */ + close(fd); exit(0); } LOGI(" - Library fd: %d\n", library_fd); - zygisk_companion_entry_func module_entry = load_module(library_fd); + zygisk_companion_entry module_entry = load_module(library_fd); close(library_fd); if (module_entry == NULL) { - LOGE("No companion module entry for module: %s\n", name); + LOGE(" - No companion module entry for module: %s\n", name); ret = write_uint8_t(fd, 0); ASSURE_SIZE_WRITE("ZygiskdCompanion", "module_entry", ret, sizeof(uint8_t)); exit(0); } else { + LOGI(" - Module entry found\n"); + ret = write_uint8_t(fd, 1); ASSURE_SIZE_WRITE("ZygiskdCompanion", "module_entry", ret, sizeof(uint8_t)); } @@ -126,12 +122,10 @@ void companion_entry(int fd) { LOGE("Something went wrong in companion. Bye!\n"); exit(0); - - break; } - + int client_fd = read_fd(fd); - if (fd == -1) { + if (client_fd == -1) { LOGE("Failed to receive client fd\n"); exit(0); @@ -149,12 +143,15 @@ void companion_entry(int fd) { args->fd = client_fd; args->entry = module_entry; - LOGI("New companion request.\n - Module name: %s\n - Client fd: %d\n", name, args->fd); + LOGI("New companion request.\n - Module name: %s\n - Client fd: %d\n", name, client_fd); - ret = write_uint8_t(args->fd, 1); + ret = write_uint8_t(client_fd, 1); ASSURE_SIZE_WRITE("ZygiskdCompanion", "client_fd", ret, sizeof(uint8_t)); - + pthread_t thread; pthread_create(&thread, NULL, entry_thread, args); + pthread_detach(thread); + + LOGI(" - Spawned companion thread for client fd: %d\n", client_fd); } } diff --git a/zygiskd/src/dl.c b/zygiskd/src/dl.c index 5018b0f..26770da 100644 --- a/zygiskd/src/dl.c +++ b/zygiskd/src/dl.c @@ -13,14 +13,13 @@ #include #include "companion.h" -#include "dl.h" #include "utils.h" #define ANDROID_NAMESPACE_TYPE_SHARED 0x2 #define ANDROID_DLEXT_USE_NAMESPACE 0x200 typedef struct AndroidNamespace { - unsigned char _unused[0]; + uint8_t _unused[0]; } AndroidNamespace; typedef struct AndroidDlextinfo { @@ -33,6 +32,8 @@ typedef struct AndroidDlextinfo { AndroidNamespace *library_namespace; } AndroidDlextinfo; +extern void *android_dlopen_ext(const char *filename, int flags, const AndroidDlextinfo *extinfo); + typedef AndroidNamespace *(*AndroidCreateNamespaceFn)( const char *name, const char *ld_library_path, @@ -43,8 +44,6 @@ typedef AndroidNamespace *(*AndroidCreateNamespaceFn)( const void *caller_addr ); -extern void *android_dlopen_ext(const char *filename, int flags, const AndroidDlextinfo *extinfo); - void *android_dlopen(char *path, int flags) { char *dir = dirname(path); struct AndroidDlextinfo info = { diff --git a/zygiskd/src/utils.c b/zygiskd/src/utils.c index 2285844..eff45d9 100644 --- a/zygiskd/src/utils.c +++ b/zygiskd/src/utils.c @@ -282,18 +282,16 @@ write_func(uint8_t) read_func(uint8_t) ssize_t write_string(int fd, const char *restrict str) { - size_t len[1]; - len[0] = strlen(str); - - ssize_t written_bytes = write(fd, &len, sizeof(size_t)); + size_t str_len = strlen(str); + ssize_t written_bytes = write(fd, &str_len, sizeof(size_t)); if (written_bytes != sizeof(size_t)) { LOGE("Failed to write string length: Not all bytes were written (%zd != %zu).\n", written_bytes, sizeof(size_t)); return -1; } - written_bytes = write(fd, str, len[0]); - if ((size_t)written_bytes != len[0]) { + written_bytes = write(fd, str, str_len); + if ((size_t)written_bytes != str_len) { LOGE("Failed to write string: Not all bytes were written.\n"); return -1; @@ -302,31 +300,30 @@ ssize_t write_string(int fd, const char *restrict str) { return written_bytes; } -ssize_t read_string(int fd, char *restrict str, size_t len) { - size_t str_len_buf[1]; - - ssize_t read_bytes = read(fd, &str_len_buf, sizeof(size_t)); +ssize_t read_string(int fd, char *restrict buf, size_t buf_size) { + size_t str_len = 0; + ssize_t read_bytes = read(fd, &str_len, sizeof(size_t)); if (read_bytes != (ssize_t)sizeof(size_t)) { LOGE("Failed to read string length: Not all bytes were read (%zd != %zu).\n", read_bytes, sizeof(size_t)); return -1; } - size_t str_len = str_len_buf[0]; - - if (str_len > len) { - LOGE("Failed to read string: Buffer is too small (%zu > %zu).\n", str_len, len); + if (str_len > buf_size - 1) { + LOGE("Failed to read string: Buffer is too small (%zu > %zu - 1).\n", str_len, buf_size); return -1; } - read_bytes = read(fd, str, str_len); + read_bytes = read(fd, buf, str_len); if (read_bytes != (ssize_t)str_len) { LOGE("Failed to read string: Promised bytes doesn't exist (%zd != %zu).\n", read_bytes, str_len); return -1; } + if (str_len > 0) buf[str_len] = '\0'; + return read_bytes; } diff --git a/zygiskd/src/utils.h b/zygiskd/src/utils.h index f5f6372..f9655f8 100644 --- a/zygiskd/src/utils.h +++ b/zygiskd/src/utils.h @@ -91,7 +91,7 @@ read_func_def(uint8_t); ssize_t write_string(int fd, const char *restrict str); -ssize_t read_string(int fd, char *restrict str, size_t len); +ssize_t read_string(int fd, char *restrict buf, size_t buf_size); bool exec_command(char *restrict buf, size_t len, const char *restrict file, char *const argv[]); diff --git a/zygiskd/src/zygiskd.c b/zygiskd/src/zygiskd.c index 702bf90..6031955 100644 --- a/zygiskd/src/zygiskd.c +++ b/zygiskd/src/zygiskd.c @@ -465,13 +465,15 @@ void zygiskd_start(char *restrict argv[]) { break; } + /* TODO: Move to another thread and save client fds to an epoll list + so that we can, in a single-thread, deal with multiple logcats */ case RequestLogcatFd: { uint8_t level = 0; ssize_t ret = read_uint8_t(client_fd, &level); ASSURE_SIZE_READ_BREAK("RequestLogcatFd", "level", ret, sizeof(level)); char tag[128 + 1]; - ret = read_string(client_fd, tag, sizeof(tag) - 1); + ret = read_string(client_fd, tag, sizeof(tag)); if (ret == -1) { LOGE("Failed reading logcat tag.\n"); @@ -480,10 +482,7 @@ void zygiskd_start(char *restrict argv[]) { break; } - tag[ret] = '\0'; - - /* INFO: Non-NULL terminated */ - char message[1024]; + char message[1024 + 1]; ret = read_string(client_fd, message, sizeof(message)); if (ret == -1) { LOGE("Failed reading logcat message.\n"); @@ -493,7 +492,7 @@ void zygiskd_start(char *restrict argv[]) { break; } - __android_log_print(level, tag, "%.*s", (int)ret, message); + __android_log_print(level, tag, "%s", message); break; } From b0a296fc294a8f9606291ca3cec6cc21ac6531c5 Mon Sep 17 00:00:00 2001 From: ThePedroo Date: Tue, 24 Dec 2024 16:56:49 -0300 Subject: [PATCH 21/46] add: support for magic mount in KSU and APatch This commit allows ReZygisk to u(n)mount mounted paths in KSU and APatch environments using magic mount. --- loader/src/injector/unmount.cpp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/loader/src/injector/unmount.cpp b/loader/src/injector/unmount.cpp index 1e0dd56..a657467 100644 --- a/loader/src/injector/unmount.cpp +++ b/loader/src/injector/unmount.cpp @@ -37,21 +37,30 @@ void revert_unmount_ksu() { ksu_loop = info.source; continue; } + // Unmount everything mounted to /data/adb if (info.target.starts_with("/data/adb")) { targets.emplace_back(info.target); } + + // Unmount everything mounted to /data/adb + if (info.root.starts_with("/adb/modules")) { + targets.emplace_back(info.target); + } + // Unmount ksu overlays if (info.type == "overlay" && info.source == KSU_OVERLAY_SOURCE && std::find(DEVICE_PARTITIONS.begin(), DEVICE_PARTITIONS.end(), info.target) != DEVICE_PARTITIONS.end()) { targets.emplace_back(info.target); } + // Unmount temp dir if (info.type == "tmpfs" && info.source == KSU_OVERLAY_SOURCE) { targets.emplace_back(info.target); } } + for (auto& info: parse_mount_info("self")) { // Unmount everything from ksu loop except ksu module dir if (info.source == ksu_loop && info.target != MODULE_DIR) { @@ -98,21 +107,30 @@ void revert_unmount_apatch() { ap_loop = info.source; continue; } + // Unmount everything mounted to /data/adb if (info.target.starts_with("/data/adb")) { targets.emplace_back(info.target); } + + // Unmount everything mounted to /data/adb + if (info.root.starts_with("/adb/modules")) { + targets.emplace_back(info.target); + } + // Unmount ksu overlays if (info.type == "overlay" && info.source == AP_OVERLAY_SOURCE && std::find(DEVICE_PARTITIONS.begin(), DEVICE_PARTITIONS.end(), info.target) != DEVICE_PARTITIONS.end()) { targets.emplace_back(info.target); } + // Unmount temp dir if (info.type == "tmpfs" && info.source == AP_OVERLAY_SOURCE) { targets.emplace_back(info.target); } } + for (auto& info: parse_mount_info("self")) { // Unmount everything from ksu loop except ksu module dir if (info.source == ap_loop && info.target != MODULE_DIR) { From 3605857d84a971e6a7e4d5bb349f13b4d53dfc00 Mon Sep 17 00:00:00 2001 From: "Pedro.js" Date: Sat, 28 Dec 2024 19:09:05 -0300 Subject: [PATCH 22/46] improve: companion handler fd closing; fix: PIPE signal handling (#103) This commit improves how we decide to close the fd that connects the injected module with the companion, avoiding both double close and fd leaks. --- zygiskd/src/.gitignore | 2 - zygiskd/src/companion.c | 71 +++++++++++++++++++++++------------ zygiskd/src/dl.c | 82 +++++++++++++---------------------------- zygiskd/src/dl.h | 2 +- zygiskd/src/utils.c | 10 ++--- zygiskd/src/utils.h | 14 +++++-- 6 files changed, 89 insertions(+), 92 deletions(-) delete mode 100644 zygiskd/src/.gitignore diff --git a/zygiskd/src/.gitignore b/zygiskd/src/.gitignore deleted file mode 100644 index 8f961c3..0000000 --- a/zygiskd/src/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -zygiskd64 -zygiskd32 \ No newline at end of file diff --git a/zygiskd/src/companion.c b/zygiskd/src/companion.c index 0646a77..9261b6f 100644 --- a/zygiskd/src/companion.c +++ b/zygiskd/src/companion.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include @@ -17,6 +18,9 @@ #include "dl.h" #include "utils.h" +#undef LOG_TAG +#define LOG_TAG lp_select("zygiskd-companion32", "zygiskd-companion64") + typedef void (*zygisk_companion_entry)(int); struct companion_module_thread_args { @@ -28,12 +32,23 @@ zygisk_companion_entry load_module(int fd) { char path[PATH_MAX]; snprintf(path, sizeof(path), "/proc/self/fd/%d", fd); - void *handle = android_dlopen(path, RTLD_NOW); + void *handle = dlopen_ext(path, RTLD_NOW); + + if (!handle) return NULL; + void *entry = dlsym(handle, "zygisk_companion_entry"); + if (!entry) { + LOGE("Failed to dlsym zygisk_companion_entry: %s\n", dlerror()); + + dlclose(handle); + + return NULL; + } return (zygisk_companion_entry)entry; } +/* WARNING: Dynamic memory based */ void *entry_thread(void *arg) { struct companion_module_thread_args *args = (struct companion_module_thread_args *)arg; @@ -42,7 +57,7 @@ void *entry_thread(void *arg) { struct stat st0 = { 0 }; if (fstat(fd, &st0) == -1) { - LOGE("Failed to get initial client fd stats: %s\n", strerror(errno)); + LOGE(" - Failed to get initial client fd stats: %s\n", strerror(errno)); free(args); @@ -56,14 +71,10 @@ void *entry_thread(void *arg) { if the module companion already closed the fd. */ struct stat st1; - if (fstat(fd, &st1) == 0) { - if (st0.st_dev == st1.st_dev && st0.st_ino == st1.st_ino) { - LOGI("Client fd stats unchanged. Closing.\n"); + if (fstat(fd, &st1) != -1 || st0.st_ino == st1.st_ino) { + LOGI(" - Client fd changed after module entry\n"); - close(fd); - } else { - LOGI("Client fd stats changed, assuming module handled closing.\n"); - } + close(fd); } free(args); @@ -80,10 +91,7 @@ void companion_entry(int fd) { if (ret == -1) { LOGE("Failed to read module name\n"); - /* TODO: Is that appropriate? */ - close(fd); - - exit(0); + goto cleanup; } LOGI(" - Module name: \"%s\"\n", name); @@ -92,10 +100,7 @@ void companion_entry(int fd) { if (library_fd == -1) { LOGE("Failed to receive library fd\n"); - /* TODO: Is that appropriate? */ - close(fd); - - exit(0); + goto cleanup; } LOGI(" - Library fd: %d\n", library_fd); @@ -109,7 +114,7 @@ void companion_entry(int fd) { ret = write_uint8_t(fd, 0); ASSURE_SIZE_WRITE("ZygiskdCompanion", "module_entry", ret, sizeof(uint8_t)); - exit(0); + goto cleanup; } else { LOGI(" - Module entry found\n"); @@ -117,18 +122,25 @@ void companion_entry(int fd) { ASSURE_SIZE_WRITE("ZygiskdCompanion", "module_entry", ret, sizeof(uint8_t)); } + struct sigaction sa; + memset(&sa, 0, sizeof(sa)); + + sigemptyset(&sa.sa_mask); + sa.sa_handler = SIG_IGN; + sigaction(SIGPIPE, &sa, NULL); + while (1) { if (!check_unix_socket(fd, true)) { LOGE("Something went wrong in companion. Bye!\n"); - exit(0); + break; } int client_fd = read_fd(fd); if (client_fd == -1) { LOGE("Failed to receive client fd\n"); - exit(0); + break; } struct companion_module_thread_args *args = malloc(sizeof(struct companion_module_thread_args)); @@ -137,7 +149,7 @@ void companion_entry(int fd) { close(client_fd); - exit(0); + break; } args->fd = client_fd; @@ -149,9 +161,20 @@ void companion_entry(int fd) { ASSURE_SIZE_WRITE("ZygiskdCompanion", "client_fd", ret, sizeof(uint8_t)); pthread_t thread; - pthread_create(&thread, NULL, entry_thread, args); - pthread_detach(thread); + if (pthread_create(&thread, NULL, entry_thread, (void *)args) == 0) + continue; - LOGI(" - Spawned companion thread for client fd: %d\n", client_fd); + LOGE(" - Failed to create thread for companion module\n"); + + close(client_fd); + free(args); + + break; } + + cleanup: + close(fd); + LOGE("Companion thread exited\n"); + + exit(0); } diff --git a/zygiskd/src/dl.c b/zygiskd/src/dl.c index 26770da..0be28f0 100644 --- a/zygiskd/src/dl.c +++ b/zygiskd/src/dl.c @@ -11,77 +11,47 @@ #include #include +#include #include "companion.h" #include "utils.h" -#define ANDROID_NAMESPACE_TYPE_SHARED 0x2 -#define ANDROID_DLEXT_USE_NAMESPACE 0x200 +#define __LOADER_ANDROID_CREATE_NAMESPACE_TYPE(name) struct android_namespace_t *(*name)( \ + const char *name, \ + const char *ld_library_path, \ + const char *default_library_path, \ + uint64_t type, \ + const char *permitted_when_isolated_path, \ + struct android_namespace_t *parent, \ + const void *caller_addr) -typedef struct AndroidNamespace { - uint8_t _unused[0]; -} AndroidNamespace; - -typedef struct AndroidDlextinfo { - uint64_t flags; - void *reserved_addr; - size_t reserved_size; - int relro_fd; - int library_fd; - off64_t library_fd_offset; - AndroidNamespace *library_namespace; -} AndroidDlextinfo; - -extern void *android_dlopen_ext(const char *filename, int flags, const AndroidDlextinfo *extinfo); - -typedef AndroidNamespace *(*AndroidCreateNamespaceFn)( - const char *name, - const char *ld_library_path, - const char *default_library_path, - uint64_t type, - const char *permitted_when_isolated_path, - AndroidNamespace *parent, - const void *caller_addr -); - -void *android_dlopen(char *path, int flags) { +void *dlopen_ext(const char* path, int flags) { + android_dlextinfo info = { 0 }; char *dir = dirname(path); - struct AndroidDlextinfo info = { - .flags = 0, - .reserved_addr = NULL, - .reserved_size = 0, - .relro_fd = 0, - .library_fd = 0, - .library_fd_offset = 0, - .library_namespace = NULL, - }; - void *handle = dlsym(RTLD_DEFAULT, "__loader_android_create_namespace"); - AndroidCreateNamespaceFn android_create_namespace_fn = (AndroidCreateNamespaceFn)handle; + __LOADER_ANDROID_CREATE_NAMESPACE_TYPE(__loader_android_create_namespace) = (__LOADER_ANDROID_CREATE_NAMESPACE_TYPE( ))dlsym(RTLD_DEFAULT, "__loader_android_create_namespace"); - AndroidNamespace *ns = android_create_namespace_fn( - path, - dir, - NULL, - ANDROID_NAMESPACE_TYPE_SHARED, - NULL, - NULL, - (const void *)&android_dlopen - ); + struct android_namespace_t *ns = __loader_android_create_namespace == NULL ? NULL : + __loader_android_create_namespace(path, dir, NULL, + 2, /* ANDROID_NAMESPACE_TYPE_SHARED */ + NULL, NULL, + (void *)&dlopen_ext); - if (ns != NULL) { + if (ns) { info.flags = ANDROID_DLEXT_USE_NAMESPACE; info.library_namespace = ns; - LOGI("Open %s with namespace %p\n", path, (void *)ns); + LOGI("Open %s with namespace %p", path, (void *)ns); } else { - LOGI("Cannot create namespace for %s\n", path); + LOGW("Cannot create namespace for %s", path); } - void *result = android_dlopen_ext(path, flags, &info); - if (result == NULL) { - LOGE("Failed to dlopen %s: %s\n", path, dlerror()); + void *handle = android_dlopen_ext(path, flags, &info); + if (handle) { + LOGI("dlopen %s: %p", path, handle); + } else { + LOGE("dlopen %s: %s", path, dlerror()); } - return result; + return handle; } diff --git a/zygiskd/src/dl.h b/zygiskd/src/dl.h index 97ba83e..de5060f 100644 --- a/zygiskd/src/dl.h +++ b/zygiskd/src/dl.h @@ -1,6 +1,6 @@ #ifndef DL_H #define DL_H -void *android_dlopen(char *path, int flags); +void *dlopen_ext(char *path, int flags); #endif /* DL_H */ diff --git a/zygiskd/src/utils.c b/zygiskd/src/utils.c index eff45d9..d0e7eba 100644 --- a/zygiskd/src/utils.c +++ b/zygiskd/src/utils.c @@ -228,11 +228,11 @@ ssize_t write_fd(int fd, int sendfd) { int read_fd(int fd) { char cmsgbuf[CMSG_SPACE(sizeof(int))]; - char buf[1] = { 0 }; - + + int cnt = 1; struct iovec iov = { - .iov_base = buf, - .iov_len = 1 + .iov_base = &cnt, + .iov_len = sizeof(cnt) }; struct msghdr msg = { @@ -242,7 +242,7 @@ int read_fd(int fd) { .msg_controllen = sizeof(cmsgbuf) }; - ssize_t ret = recvmsg(fd, &msg, 0); + ssize_t ret = recvmsg(fd, &msg, MSG_WAITALL); if (ret == -1) { LOGE("recvmsg: %s\n", strerror(errno)); diff --git a/zygiskd/src/utils.h b/zygiskd/src/utils.h index f9655f8..7cc6bbf 100644 --- a/zygiskd/src/utils.h +++ b/zygiskd/src/utils.h @@ -9,12 +9,18 @@ #define CONCAT_(x,y) x##y #define CONCAT(x,y) CONCAT_(x,y) -#define LOGI(...) \ - __android_log_print(ANDROID_LOG_INFO, lp_select("zygiskd32", "zygiskd64"), __VA_ARGS__); \ +#define LOG_TAG lp_select("zygiskd32", "zygiskd64") + +#define LOGI(...) \ + __android_log_print(ANDROID_LOG_INFO, LOG_TAG, __VA_ARGS__); \ printf(__VA_ARGS__); -#define LOGE(...) \ - __android_log_print(ANDROID_LOG_ERROR , lp_select("zygiskd32", "zygiskd64"), __VA_ARGS__); \ +#define LOGW(...) \ + __android_log_print(ANDROID_LOG_WARN, LOG_TAG, __VA_ARGS__); \ + printf(__VA_ARGS__); + +#define LOGE(...) \ + __android_log_print(ANDROID_LOG_ERROR , LOG_TAG, __VA_ARGS__); \ printf(__VA_ARGS__); #define ASSURE_SIZE_WRITE(area_name, subarea_name, sent_size, expected_size) \ From d8034b7bde6157823d632fd718689db053083d8d Mon Sep 17 00:00:00 2001 From: ThePedroo Date: Sun, 29 Dec 2024 19:16:09 -0300 Subject: [PATCH 23/46] add: Magisk Kitsune SuList support This commit adds support for the Kitsune SuList, a denylist in whitelist mode. --- zygiskd/src/root_impl/magisk.c | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/zygiskd/src/root_impl/magisk.c b/zygiskd/src/root_impl/magisk.c index d33e71a..9f4e364 100644 --- a/zygiskd/src/root_impl/magisk.c +++ b/zygiskd/src/root_impl/magisk.c @@ -31,6 +31,7 @@ char *magisk_managers[] = { enum magisk_variants variant = Official; /* INFO: Longest path */ static char path_to_magisk[sizeof(DEBUG_RAMDISK_MAGISK)]; +bool is_using_sulist = false; void magisk_get_existence(struct root_impl_state *state) { struct stat s; @@ -78,7 +79,7 @@ void magisk_get_existence(struct root_impl_state *state) { strcpy(path_to_magisk, SBIN_MAGISK); } - char *argv[] = { "magisk", "-v", NULL }; + char *argv[4] = { "magisk", "-v", NULL, NULL }; char magisk_info[128]; if (!exec_command(magisk_info, sizeof(magisk_info), (const char *)path_to_magisk, argv)) { @@ -113,6 +114,27 @@ void magisk_get_existence(struct root_impl_state *state) { return; } + /* INFO: Magisk Kitsune has a feature called SuList, which is a whitelist of + which processes are allowed to see root. Although only Kitsune has + this option, there are Kitsune forks without "-kitsune" suffix, so + to avoid excluding them from taking advantage of that feature, we + will not check the variant. + */ + argv[1] = "--sqlite"; + argv[2] = "select value from settings where key = 'sulist' limit 1"; + + char sulist_enabled[32]; + if (!exec_command(sulist_enabled, sizeof(sulist_enabled), (const char *)path_to_magisk, argv)) { + LOGE("Failed to execute magisk binary: %s\n", strerror(errno)); + errno = 0; + + state->state = Abnormal; + + return; + } + + is_using_sulist = strcmp(sulist_enabled, "value=1") == 0; + if (atoi(magisk_version) >= MIN_MAGISK_VERSION) state->state = Supported; else state->state = TooOld; } @@ -158,7 +180,10 @@ bool magisk_uid_should_umount(uid_t uid) { char *package_name = strtok(result + strlen("package:"), " "); char sqlite_cmd[256]; - snprintf(sqlite_cmd, sizeof(sqlite_cmd), "select 1 from denylist where package_name=\"%s\" limit 1", package_name); + if (is_using_sulist) + snprintf(sqlite_cmd, sizeof(sqlite_cmd), "select 1 from sulist where package_name=\"%s\" limit 1", package_name); + else + snprintf(sqlite_cmd, sizeof(sqlite_cmd), "select 1 from denylist where package_name=\"%s\" limit 1", package_name); char *const argv[] = { "magisk", "--sqlite", sqlite_cmd, NULL }; @@ -169,7 +194,8 @@ bool magisk_uid_should_umount(uid_t uid) { return false; } - return result[0] != '\0'; + if (is_using_sulist) return result[0] == '\0'; + else return result[0] != '\0'; } bool magisk_uid_is_manager(uid_t uid) { From e56cc85948a29b90973f3578c4402abc35bb8d7f Mon Sep 17 00:00:00 2001 From: Lucky Kiddos <95188840+GuitarHeroStyles@users.noreply.github.com> Date: Sat, 11 Jan 2025 11:17:51 +0700 Subject: [PATCH 24/46] add: Indonesian README.md (#108) This commit adds Indonesian translation for README. Signed-off-by: Lucky Kiddos <95188840+GuitarHeroStyles@users.noreply.github.com> --- README.md | 2 +- READMEs/README_id-ID.md | 63 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 READMEs/README_id-ID.md diff --git a/README.md b/README.md index 3fbf1e8..b987ffe 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # ReZygisk -[简体中文](/READMEs/README_zh-CN.md)|[繁體中文](/READMEs/README_zh-TW.md) +[简体中文](/READMEs/README_zh-CN.md)|[繁體中文](/READMEs/README_zh-TW.md)|[Bahasa Indonesia](/READMEs/README_id-ID.md) ReZygisk is a fork of Zygisk Next, a standalone implementation of Zygisk, providing Zygisk API support for KernelSU, Magisk (besides built-in), and APatch (Work In Progress). diff --git a/READMEs/README_id-ID.md b/READMEs/README_id-ID.md new file mode 100644 index 0000000..6bc9471 --- /dev/null +++ b/READMEs/README_id-ID.md @@ -0,0 +1,63 @@ +# ReZygisk + +[English](https://github.com/PerformanC/ReZygisk) + +ReZygisk adalah turunan dari Zygisk Next, sebuah implementasi mandiri Zygisk, yang mendukung API Zygisk untuk KernelSU, Magisk (selain versi bawaan), dan APatch (dalam tahap pengembangan). + +Proyek ini bertujuan untuk memodernisasi dan menulis ulang basis kode ke dalam bahasa pemorgraman C (dari C++ dan Rust), memungkinkan implementasi API Zygisk yang lebih efisien dan cepat dengan lisensi yang lebih permisif. + +> [!NOTE] +> [CATATAN] +> +> Modul/turunan ini sedang dalam tahap pengembangan. gunakan hanya file .zip dari halaman Rilis. +> +> Anda dapat menginstal file .zip dari halaman [Actions](https://github.com/PerformanC/ReZygisk/actions), namun instalan ini sepenuhnya menjadi tanggung jawab Anda karena perangkat dapat mengalami bootloop. + +## Mengapa? + +Rilisan terbaru dari Zygisk Next tidak bersifat open-source, dengan kode yang sepenuhnya dikendalikan oleh developernya. Hal ini tidak hanya membatasi kemampuan kami untuk berkontribusi pada proyek ini, tetapi juga membuat kode tidak dapat diaudit, yang menjadi masalah utama keamanan karena Zygisk Next adalah modul yang berjalan dengan hak superuser (root), yang memiliki akses ke seluruh sistem. + +Meskipun developer Zygisk Next terkenal dan dipercaya dalam komunitas Android, hal ini tidak menjamin bahwa kode tersebut bebas dari bahaya atau kerentanan. Kami (PerformanC) memahami alasan mereka untuk menjaga kode tetap tertutup, tetapi kami memiliki pandangan yang berbeda. + +## Kelebihan + +- FOSS (Free and Open Source Software) Selamanya. + +## Komponen Pendukung + +| Alat | Deskripsi | +|-----------------|------------------------------------------| +| `Android NDK` | Native Development Kit untuk Android | + +### Komponen Pendukung C++ + +| Komponen | Deskripsi | +|------------|---------------------------------| +| `lsplt` | Simple PLT Hook untuk Android | + +## Penggunaan + +Kami saat ini sedang dalam tahap pengembangan. (Segera Hadir) + +## Instalasi + +Saat ini belum tersedia rilisan yang stabil. (Segera Hadir) + +## Terjemahan + +Saat ini, kami belum terintegrasi dengan platform lain untuk penerjemahan, tetapi Anda dapat berkontribusi pada cabang [add/new-webui](https://github.com/PerformanC/ReZygisk/tree/add/new-webui). Jangan lupa untuk menyertakan profil GitHub Anda di [TRANSLATOR.md](https://github.com/PerformanC/ReZygisk/blob/add/new-webui/TRANSLATOR.md) agar orang lain dapat melihat kontribusi Anda. + +## Dukungan +Untuk pertanyaan terkait ReZygisk atau proyek PerformanC lainnya, silakan bergabung ke salah satu saluran berikut: + +- Saluran Discord: [PerformanC](https://discord.gg/uPveNfTuCJ) +- Saluran Telegram ReZygisk: [@rezygiskchat](https://t.me/rezygiskchat) +- Saluran Telegram PerformanC: [@performancorg](https://t.me/performancorg) + +## Kontribusi + +Wajib mengikuti [Pedoman Kontribusi](https://github.com/PerformanC/contributing) PerformanC untuk berkontribusi pada ReZygisk. Sesuai dengan Kebijakan Keamanan, Kode Etik, dan standar struktur dan format yang berlaku. + +## Lisensi + +ReZygisk sebagian besar berlisensi di bawah GPL, oleh Dr-TSNG, tetapi juga AGPL 3.0, oleh The PerformanC Organization, untuk kode yang ditulis ulang. Anda dapat juga membaca lebih lanjut di [Open Source Initiative](https://opensource.org/licenses/AGPL-3.0). From 3bc3b478ff9e4ee26c1dfeafe8a18105b8428255 Mon Sep 17 00:00:00 2001 From: "Arisu: Rain" Date: Sat, 11 Jan 2025 00:57:26 -0800 Subject: [PATCH 25/46] add: vietnamese README (#110) This commit adds Vietnam language README to the repository. --- README.md | 2 +- READMEs/README_vi-VN.md | 61 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 READMEs/README_vi-VN.md diff --git a/README.md b/README.md index b987ffe..fc76a76 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # ReZygisk -[简体中文](/READMEs/README_zh-CN.md)|[繁體中文](/READMEs/README_zh-TW.md)|[Bahasa Indonesia](/READMEs/README_id-ID.md) +[简体中文](/READMEs/README_zh-CN.md)|[繁體中文](/READMEs/README_zh-TW.md)|[Bahasa Indonesia](/READMEs/README_id-ID.md)|[Tiếng Việt](/READMEs/README_vi-VN.md)| ReZygisk is a fork of Zygisk Next, a standalone implementation of Zygisk, providing Zygisk API support for KernelSU, Magisk (besides built-in), and APatch (Work In Progress). diff --git a/READMEs/README_vi-VN.md b/READMEs/README_vi-VN.md new file mode 100644 index 0000000..7c63d50 --- /dev/null +++ b/READMEs/README_vi-VN.md @@ -0,0 +1,61 @@ +# ReZygisk + +[English](../README.md) + +ReZygisk làm một nhánh phát triển lấy từ ZygiskNext, một triển khai độc lập của Zygisk, cung cấp và hỗ trợ Zygisk API cho KernelSU, Magisk (bên cạnh tích hợp) và APatch (Đang trong quá trình phát triển). + +Mục tiêu của ReZygisk là mô-đun hoá và viết lại toàn bộ codebase từ C++/Rust sang C, cho phép triển khai API Zygisk hiệu quả hơn và nhanh hơn với giấy phép dễ dàng tái sử dụng hơn. + +> [!NOTE] +> Mô-đun này đang trong quá trình phát triển; chỉ nên sử dụng file .zip từ các bản phát hành. +> +> Mạc dù bạn có thể cài đặt mô-đun được lấy từ trang [Actions](https://github.com/PerformanC/ReZygisk/actions), nhưng sẽ chỉ phụ thuộc vào bạn có chấp nhận rủi ro hay không vì các mô-đun này có thể gây lỗi cho hệ điều hành. Ví dụ: Bootloop (Lỗi liên tục khởi động lại máy) + +## Tại sao nhánh phát triển này lại xuất hiện? + +Bản ra mắt mới nhất của Zygisk Next không còn là mã nguồn mở, dành toàn bộ quyền phát triển phần mềm cho những nhà phát triển gốc. Không chỉ giới hạn chúng ta đóng gốp cho dự án, mà còn bất khả thi trong việc kiểm trả độ đảm bảo của mã, điều mà có thể coi là mối quan tâm lớn về tính bảo mật và độ an toàn, bởi Zygisk Next là mô-đun chạy dưới quyền quản trị (root), có khả năng truy cập vào toàn bộ hệ thống trong thiết bị của bạn. + +Các nhà phát triển Zygisk Next đều là những người nổi tiếng và được tin tưởng bởi cộng đồng sử dụng Android, tuy nhiên, điều đó không có nghĩa là mã nguồn của họ không có lỗ hổng hoặc có nguy cơ bị tấn công. Chúng tôi (PerformanC) thông cảm được lý do mà học đóng mã nguồn của họ vào, tuy nhiễn chúng tôi tin vào điều ngược lại. + +## Ưu điểm + +- Mã nguồn mở (Vĩnh Viễn) + +## Các công cụ/thư viện được sử dụng + +| Công cụ | Mô tả | +|-----------------|-------------------------------------------| +| `Android NDK` | Bộ công cụ phát triển cốt lõi cho Android | + +### Các công cụ/thư viện của C++ được sử dụng + +| Thư Viện | Mô Tả | +|------------|----------------------------------------------| +| `lsplt` | Công cụ **móc** vào PLT đơn giản cho Android | + +## Các sử dụng + +Chúng tôi đang trong quá trình phát triển (Sắp ra mắt) + +## Cài Đặt + +Hiện chưa có bản ra mắt ổn định (Sắp ra mắt) + +## Dịch WebUI cho mô-đun + +Hiện tai, chúng tôi chưa tích hợp nền táng dịch nào để dịch một cách thuận tiện nhưng bạn có thể đóng góp vào nhánh [add/new-webui](https://github.com/PerformanC/ReZygisk/tree/add/new-webui). Đừng quên thêm trang cá nhân Github của bạn vào [TRANSLATOR.md](https://github.com/PerformanC/ReZygisk/blob/add/new-webui/TRANSLATOR.md) để mọi người thâys được đóng góp của bạn + +## Hỗ trợ +Nếu bạn có những câu hỏi nào dành cho ReZygisk hoặc bất kì một dự án nào của PerformanC, hãy tự nhiên tham gia các kênh trò chuyện dưới đây: + +- Discord: [PerformanC](https://discord.gg/uPveNfTuCJ) +- Telegram [ReZygisk]: [@rezygiskchat](https://t.me/rezygiskchat) +- Telegram [PerformanC]: [@performancorg](https://t.me/performancorg) + +## Đóng góp cho dự án này + +Tuân theo [hướng dẫn đóng góp](https://github.com/PerformanC/contributing) của PerformanC là một điều tất yếu mà bạn bắt buộc phải làm. Hãy tuân theo chính sách bảo mật, quy tắc ứng xử/đóng góp mã nguồn và tiêu chuẩn cú pháp riêng. + +## Bản quyền + +Hầu hết các thành phần của ReZygisk để dưới bản quyền GPL (bởi Dr-TSNG) và AGPL 3.0 (bởiThe PerformanC Organization) cho những phần được viết lại. Bạn có thể xem thêm trong trang [Open Source Initiative](https://opensource.org/licenses/AGPL-3.0). \ No newline at end of file From cfd4a92b3110b1aa70071ab3e629bf3a40adecb9 Mon Sep 17 00:00:00 2001 From: "Pedro.js" Date: Sat, 11 Jan 2025 07:05:52 -0300 Subject: [PATCH 26/46] add: Brazilian Portuguese `README.md` (#112) This commit adds the language from Brazil to the list of available translations of README.md file --- README.md | 2 +- READMEs/README_pt-BR.md | 62 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 READMEs/README_pt-BR.md diff --git a/README.md b/README.md index fc76a76..1fd98df 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # ReZygisk -[简体中文](/READMEs/README_zh-CN.md)|[繁體中文](/READMEs/README_zh-TW.md)|[Bahasa Indonesia](/READMEs/README_id-ID.md)|[Tiếng Việt](/READMEs/README_vi-VN.md)| +[简体中文](/READMEs/README_zh-CN.md)|[繁體中文](/READMEs/README_zh-TW.md)|[Bahasa Indonesia](/READMEs/README_id-ID.md)|[Tiếng Việt](/READMEs/README_vi-VN.md)|[Português Brasileiro](/READMEs/README_pt-BR.md) ReZygisk is a fork of Zygisk Next, a standalone implementation of Zygisk, providing Zygisk API support for KernelSU, Magisk (besides built-in), and APatch (Work In Progress). diff --git a/READMEs/README_pt-BR.md b/READMEs/README_pt-BR.md new file mode 100644 index 0000000..46d070a --- /dev/null +++ b/READMEs/README_pt-BR.md @@ -0,0 +1,62 @@ +# ReZygisk + +[English](../README.md) + +ReZygisk é uma fork do Zygisk Next, uma implementação do Zygisk independente, fornecendo a API do Zygisk para o kernelSU, Magisk (além do embutido) e APatch (a ser desenvolvido). + +Ele foca em modernizar e re-escrever o código fonte para C (de C++ e Rust), permitindo uma implementação da API do Zygisk com uma licença mais permissiva. + +> [!NOTE] +> Este módulo/fork ainda está em processo de desenvolvimento; apenas use .zip da aba Releases. +> +> Apesar de você poder instalar um .zip da aba [Actions](https://github.com/PerformanC/ReZygisk/actions), é de sua conta e risco, já que pode acarretar em um bootloop. + +## Por quê? + +Os últimos lançamentos do Zygisk Next não possuem código aberto, reservando-o para os seus desenvolvedores. Isso não só limita nossa capacidade de contribuir com o projeto, mas também impossibilita a auditoria do código, uma preocupação grave de segurança, já que o Zygisk Next é um módulo que roda como superuser (super usuário/root), tendo acesso a todo o sistema. + +Os desenvolvedores do Zygisk Next são famosos e confiados pela comunidade Android, mas isso não significa que o código não seja nem malicioso nem vulnerável. Nós (PerformanC) reconhecemos seus motivos de manterem o código recluso a eles, mas a gente acredita no contrário. + +## Vantagens + +- FOSS (Pra sempre) + +## Dependências + +| Ferramenta | Descrição | +|-----------------|--------------------------------------------| +| `Android NDK` | Kit de Desenvolvimento Nativo para Android | + +### Dependências C++ + +| Dependência | Descrição | +|-------------|-------------------------------| +| `lsplt` | PLT Hook simples para Android | + +## Forma de uso + +Estamos ainda em processo de desenvolvimento desta aba. (Em breve) + +## Processo de instalação + +Estamos ainda em processo de desenvolvimento desta aba. (Em breve) + +## Tradução + +Até agora, a gente não possui uma plataforma para traduções, mas você pode contribuir para a branch [add/new-webui](https://github.com/PerformanC/ReZygisk/tree/add/new-webui). Por favor, não esqueça de incluir seu perfil do GitHub no [TRANSLATOR.md](https://github.com/PerformanC/ReZygisk/blob/add/new-webui/TRANSLATOR.md) para que assim outras pessoas vejam sua contribuição. + +## Suporte + +Para quaisquer problemas no ReZygisk ou qualquer projeto da PerformanC, sinta-se livre para entrar em qualquer canal abaixo: + +- Server do Discord: [PerformanC](https://discord.gg/uPveNfTuCJ) +- Canal do Telegram ReZygisk: [@rezygiskchat](https://t.me/rezygiskchat) +- Canal do Telegram PerformanC: [@performancorg](https://t.me/performancorg) + +## Contribuição + +É obrigatório seguir as [Regras de Contribuição](https://github.com/PerformanC/contributing) da PerformanC para contribuir ao ReZygisk, seguindo sua Política de Segurança, Código de Conduta, e padronização de sintaxe. + +## Licença + +ReZygisk é majoritamente licenciado em GPL, por Dr-TSNG, mas também em AGPL 3.0, pela A Organização PerformanC (The PerformanC Organization) para código re-escrito. Você pode ler mais em [Open Source Initiative](https://opensource.org/licenses/AGPL-3.0). From bc6cf67c7be00461a70e6a4683eac81aff72a17b Mon Sep 17 00:00:00 2001 From: Berk Mirsat Date: Mon, 27 Jan 2025 14:40:28 +0300 Subject: [PATCH 27/46] add: Turkish README.md (#114) This commit adds README translations for Turkey's launguage. --- README.md | 2 +- READMEs/README_tr-TR.md | 61 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 READMEs/README_tr-TR.md diff --git a/README.md b/README.md index 1fd98df..92b4a6c 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # ReZygisk -[简体中文](/READMEs/README_zh-CN.md)|[繁體中文](/READMEs/README_zh-TW.md)|[Bahasa Indonesia](/READMEs/README_id-ID.md)|[Tiếng Việt](/READMEs/README_vi-VN.md)|[Português Brasileiro](/READMEs/README_pt-BR.md) +[简体中文](/READMEs/README_zh-CN.md)|[繁體中文](/READMEs/README_zh-TW.md)|[Bahasa Indonesia](/READMEs/README_id-ID.md)|[Tiếng Việt](/READMEs/README_vi-VN.md)|[Português Brasileiro](/READMEs/README_pt-BR.md)|[Türkçe](/READMEs/README_tr-TR.md) ReZygisk is a fork of Zygisk Next, a standalone implementation of Zygisk, providing Zygisk API support for KernelSU, Magisk (besides built-in), and APatch (Work In Progress). diff --git a/READMEs/README_tr-TR.md b/READMEs/README_tr-TR.md new file mode 100644 index 0000000..2e7093c --- /dev/null +++ b/READMEs/README_tr-TR.md @@ -0,0 +1,61 @@ +# ReZygisk + +[English](../README.md) + +ReZygisk, Zygisk Next'in bir forkudur ve Zygisk'in bağımsız bir uygulamasıdır. KernelSU, Magisk (yerleşik olanın dışında) ve APatch (Çalışmalar Devam Ediyor) için Zygisk API desteği sağlar. + +Amacı, C++ ve Rust'tan C diline geçerek kod tabanını modernize etmek ve yeniden yazmaktır. Bu, daha verimli ve hızlı bir Zygisk API uygulaması sağlarken daha esnek bir lisans sunar. + +> [!NOT] +> Bu modül/fork şu anda geliştirme aşamasındadır (WIP - Work In Progress); yalnızca Release'deki .zip dosyasını kullanın. +> +> [Actions](https://github.com/PerformanC/ReZygisk/actions) sayfasındaki .zip dosyasını yüklemek tamamen sizin sorumluluğunuzdadır; cihazınız bootloop'a girebilir. + +## Neden? + +Zygisk Next'in son sürümleri açık kaynaklı değildir ve tamamen geliştiricilerine ayrılmıştır. Bu durum, projeye katkıda bulunma yeteneğimizi sınırlamakla kalmaz, aynı zamanda kodun denetlenmesini imkansız hale getirir. Bu, Zygisk Next'in süper kullanıcı (root) ayrıcalıklarıyla çalışması ve tüm sisteme erişimi olması nedeniyle büyük bir güvenlik sorunudur. + +Zygisk Next geliştiricileri, Android topluluğunda tanınmış ve güvenilir kişilerdir, ancak bu, kodun kötü niyetli veya hassas olmadığını garanti etmez. PerformanC olarak, kodu kapalı kaynaklı tutma nedenlerini anlasak da, bunun tersini savunuyoruz. + +## Avantajlar + +- Sonsuza kadar açık kaynak (FOSS) + +## Bağımlılıklar + +| Araç | Açıklama | +|------------------|--------------------------------------| +| `Android NDK` | Android için Yerel Geliştirme Kiti | + +### C++ Bağımlılıkları + +| Bağımlılık | Açıklama | +|------------|---------------------------------| +| `lsplt` | Android için Basit PLT Hook | + +## Kullanım + +Şu anda geliştirme aşamasındayız. (Yakında) + +## Kurulum + +Şu anda mevcut kararlı sürüm yoktur. (Yakında) + +## Çeviri + +Şu anda başka bir platformla entegre bir çeviri sistemimiz bulunmuyor, ancak [add/new-webui](https://github.com/PerformanC/ReZygisk/tree/add/new-webui) branch'ine katkıda bulunabilirsiniz. Lütfen GitHub profilinizi [TRANSLATOR.md](https://github.com/PerformanC/ReZygisk/blob/add/new-webui/TRANSLATOR.md) dosyasına eklemeyi unutmayın, böylece katkılarınız görülebilir. + +## Destek +ReZygisk veya diğer PerformanC projeleriyle ilgili herhangi bir soru için aşağıdaki kanallardan herhangi birine katılabilirsiniz: + +- Discord Kanalı: [PerformanC](https://discord.gg/uPveNfTuCJ) +- ReZygisk Telegram Kanalı: [@rezygiskchat](https://t.me/rezygiskchat) +- PerformanC Telegram Kanalı: [@performancorg](https://t.me/performancorg) + +## Katkıda Bulunma + +ReZygisk'e katkıda bulunmak için PerformanC'nin [Katkı Yönergeleri](https://github.com/PerformanC/contributing)'ni takip etmek zorunludur. Güvenlik Politikası, Davranış Kuralları ve sözdizimi standartlarına uyulmalıdır. + +## Lisans + +ReZygisk, büyük ölçüde Dr-TSNG tarafından GPL lisansı altında, ancak yeniden yazılmış kodlar için The PerformanC Organization tarafından AGPL 3.0 lisansı altında lisanslanmıştır. Daha fazla bilgi için [Open Source Initiative](https://opensource.org/licenses/AGPL-3.0)'e göz atabilirsiniz. From 92e2f528a905e27dfa321e4131f6125355fa8edb Mon Sep 17 00:00:00 2001 From: Reveny <113244907+reveny@users.noreply.github.com> Date: Sat, 22 Mar 2025 23:12:24 +0100 Subject: [PATCH 28/46] add: Android 9 support (#117) This commit makes ReZygisk load Zygisk libraries directly, not utilizing memfd, as it doesn't exist in older versions of Android. --- loader/src/common/dl.cpp | 14 +++++++++++++- loader/src/common/files.cpp | 15 +++++++++++++++ loader/src/include/files.hpp | 3 +++ loader/src/injector/hook.cpp | 4 ++-- zygiskd/src/zygiskd.c | 30 +----------------------------- 5 files changed, 34 insertions(+), 32 deletions(-) diff --git a/loader/src/common/dl.cpp b/loader/src/common/dl.cpp index 4bcd3b3..6d30432 100644 --- a/loader/src/common/dl.cpp +++ b/loader/src/common/dl.cpp @@ -6,6 +6,7 @@ #include #include "dl.h" +#include "files.hpp" #include "logging.h" extern "C" [[gnu::weak]] struct android_namespace_t* @@ -50,11 +51,22 @@ void* DlopenMem(int fd, int flags) { .library_fd = fd }; - auto* handle = android_dlopen_ext("/jit-cache-zygisk", flags, &info); + /* INFO: We need to find the path of the fd since passing "" to android_dlopen_ext + will not work and passing the original "jit-cache-zygisk" will cause a detection again. */ + char path[PATH_MAX]; + if (get_path_from_fd(fd, path, sizeof(path)) != 0) { + LOGE("Failed to get path for fd: %d", fd); + return NULL; + } + + LOGD("Path for fd %d: %s", fd, path); + + auto *handle = android_dlopen_ext(path, flags, &info); if (handle) { LOGV("dlopen fd %d: %p", fd, handle); } else { LOGE("dlopen fd %d: %s", fd, dlerror()); } + return handle; } diff --git a/loader/src/common/files.cpp b/loader/src/common/files.cpp index e597295..ade40de 100644 --- a/loader/src/common/files.cpp +++ b/loader/src/common/files.cpp @@ -120,3 +120,18 @@ sDIR make_dir(DIR *dp) { sFILE make_file(FILE *fp) { return sFILE(fp, [](FILE *fp){ return fp ? fclose(fp) : 1; }); } + +int get_path_from_fd(int fd, char *buf, size_t size) { + if (fd < 0 || !buf || size == 0) return -1; + + /* NOTE: We assume that the path is always at /data/adb/modules/xxx + which should never be longer than 128 chars. */ + char proc_path[128]; + snprintf(proc_path, sizeof(proc_path), "/proc/self/fd/%d", fd); + + ssize_t len = readlink(proc_path, buf, size - 1); + if (len == -1) return -1; + + buf[len] = '\0'; + return 0; +} \ No newline at end of file diff --git a/loader/src/include/files.hpp b/loader/src/include/files.hpp index 73bc9e2..4f16e0c 100644 --- a/loader/src/include/files.hpp +++ b/loader/src/include/files.hpp @@ -2,6 +2,7 @@ #include #include #include +#include struct mount_info { unsigned int id; @@ -26,6 +27,8 @@ void file_readline(const char *file, const std::function std::vector parse_mount_info(const char *pid); +int get_path_from_fd(int fd, char *buf, size_t size); + using sFILE = std::unique_ptr; using sDIR = std::unique_ptr; sDIR make_dir(DIR *dp); diff --git a/loader/src/injector/hook.cpp b/loader/src/injector/hook.cpp index ae41b6a..5255d37 100644 --- a/loader/src/injector/hook.cpp +++ b/loader/src/injector/hook.cpp @@ -591,7 +591,7 @@ void ZygiskContext::run_modules_post() { if (modules.size() > 0) { LOGD("modules unloaded: %zu/%zu", modules_unloaded, modules.size()); - clean_trace("jit-cache-zygisk", modules.size(), modules_unloaded, true); + clean_trace("/data/adb", modules.size(), modules_unloaded, true); } } @@ -762,7 +762,7 @@ void clean_trace(const char* path, size_t load, size_t unload, bool spoof_maps) // spoofing map names is futile in Android, we do it simply // to avoid Zygisk detections based on string comparison for (auto &map : lsplt::MapInfo::Scan()) { - if (strstr(map.path.c_str(), path)) + if (strstr(map.path.c_str(), path) && strstr(map.path.c_str(), "libzygisk") == 0) { void *addr = (void *)map.start; size_t size = map.end - map.start; diff --git a/zygiskd/src/zygiskd.c b/zygiskd/src/zygiskd.c index 6031955..0c0d952 100644 --- a/zygiskd/src/zygiskd.c +++ b/zygiskd/src/zygiskd.c @@ -83,35 +83,7 @@ int create_library_fd(const char *restrict so_path) { return -1; } - /* INFO: This is required as older implementations of glibc may not - have the memfd_create function call, causing a crash. */ - int memfd = (int)syscall(SYS_memfd_create, "jit-cache-zygisk", MFD_ALLOW_SEALING); - if (memfd == -1) { - LOGE("Failed creating memfd: %s\n", strerror(errno)); - - return -1; - } - - if (sendfile(memfd, so_fd, NULL, (size_t)so_size) == -1) { - LOGE("Failed copying so file to memfd: %s\n", strerror(errno)); - - close(so_fd); - close(memfd); - - return -1; - } - - close(so_fd); - - if (fcntl(memfd, F_ADD_SEALS, F_SEAL_SHRINK | F_SEAL_GROW | F_SEAL_WRITE | F_SEAL_SEAL) == -1) { - LOGE("Failed sealing memfd: %s\n", strerror(errno)); - - close(memfd); - - return -1; - } - - return memfd; + return so_fd; } /* WARNING: Dynamic memory based */ From 9aafc279d5f7a492acff3f0de1ddbc2ecc8d8d9c Mon Sep 17 00:00:00 2001 From: Reveny <113244907+reveny@users.noreply.github.com> Date: Sun, 23 Mar 2025 19:11:33 +0100 Subject: [PATCH 29/46] improve: use all threads for compiling (#118) This commit speeds up the build process by almost 50% when building with github actions by using all system threads to compile ReZygisk. --- loader/build.gradle.kts | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/build.gradle.kts b/loader/build.gradle.kts index 442f3a2..f9d9f8e 100644 --- a/loader/build.gradle.kts +++ b/loader/build.gradle.kts @@ -56,6 +56,7 @@ android { externalNativeBuild.cmake { arguments += "-DANDROID_STL=none" arguments += "-DLSPLT_STANDALONE=ON" + arguments += "-DCMAKE_BUILD_PARALLEL_LEVEL=${Runtime.getRuntime().availableProcessors()}" cFlags("-std=c18", *defaultCFlags) cppFlags("-std=c++20", *defaultCFlags) ccachePath?.let { From 886e2f8396979781d82983f9536b76f75373d909 Mon Sep 17 00:00:00 2001 From: "Pedro.js" Date: Sat, 29 Mar 2025 12:17:57 -0300 Subject: [PATCH 30/46] improve: mounting system, compatibility; remove: logging on release (#111) This commit adds numerous improvements to the state of hidden'ility of ReZygisk, and also for compatibility. Recommended to check #111 for more information. --- loader/src/common/daemon.cpp | 47 ++-- loader/src/common/dl.cpp | 9 +- loader/src/common/elf_util.cpp | 6 +- loader/src/common/logging.cpp | 36 --- loader/src/include/daemon.h | 18 +- loader/src/include/elf_util.h | 16 +- loader/src/include/logging.h | 39 ++-- loader/src/include/solist.hpp | 61 ++--- loader/src/injector/entry.cpp | 8 +- loader/src/injector/hook.cpp | 95 ++++---- loader/src/injector/module.hpp | 8 +- loader/src/injector/unmount.cpp | 145 ------------ loader/src/injector/zygisk.hpp | 6 - module/src/sepolicy.rule | 30 +-- zygiskd/build.gradle.kts | 2 +- zygiskd/src/constants.h | 35 ++- zygiskd/src/root_impl/common.c | 3 + zygiskd/src/utils.c | 389 +++++++++++++++++++++++++++++++- zygiskd/src/utils.h | 2 + zygiskd/src/zygiskd.c | 78 +++---- 20 files changed, 621 insertions(+), 412 deletions(-) delete mode 100644 loader/src/common/logging.cpp delete mode 100644 loader/src/injector/unmount.cpp diff --git a/loader/src/common/daemon.cpp b/loader/src/common/daemon.cpp index 34a188c..bd558ca 100644 --- a/loader/src/common/daemon.cpp +++ b/loader/src/common/daemon.cpp @@ -63,19 +63,6 @@ namespace zygiskd { return true; } - int RequestLogcatFd() { - int fd = Connect(1); - if (fd == -1) { - PLOGE("RequestLogcatFd"); - - return -1; - } - - socket_utils::write_u8(fd, (uint8_t) SocketAction::RequestLogcatFd); - - return fd; - } - uint32_t GetProcessFlags(uid_t uid) { int fd = Connect(1); if (fd == -1) { @@ -94,8 +81,8 @@ namespace zygiskd { return res; } - std::vector ReadModules() { - std::vector modules; + std::vector ReadModules() { + std::vector modules; int fd = Connect(1); if (fd == -1) { PLOGE("ReadModules"); @@ -260,4 +247,34 @@ namespace zygiskd { close(fd); } else info->running = false; } + + std::string UpdateMountNamespace(enum mount_namespace_state nms_state) { + int fd = Connect(1); + if (fd == -1) { + PLOGE("UpdateMountNamespace"); + + return ""; + } + + socket_utils::write_u8(fd, (uint8_t) SocketAction::UpdateMountNamespace); + socket_utils::write_u32(fd, getpid()); + socket_utils::write_u8(fd, (uint8_t)nms_state); + + uint32_t target_pid = socket_utils::read_u32(fd); + int target_fd = 0; + + if (target_pid == 0) goto error; + + target_fd = (int)socket_utils::read_u32(fd); + if (target_fd == 0) goto error; + + close(fd); + + return "/proc/" + std::to_string(target_pid) + "/fd/" + std::to_string(target_fd); + + error: + close(fd); + + return ""; + } } diff --git a/loader/src/common/dl.cpp b/loader/src/common/dl.cpp index 6d30432..352b8f9 100644 --- a/loader/src/common/dl.cpp +++ b/loader/src/common/dl.cpp @@ -46,9 +46,14 @@ void* DlopenExt(const char* path, int flags) { } void* DlopenMem(int fd, int flags) { - auto info = android_dlextinfo{ + auto info = android_dlextinfo { .flags = ANDROID_DLEXT_USE_LIBRARY_FD, - .library_fd = fd + .reserved_addr = NULL, + .reserved_size = 0, + .relro_fd = 0, + .library_fd = fd, + .library_fd_offset = 0, + .library_namespace = NULL }; /* INFO: We need to find the path of the fd since passing "" to android_dlopen_ext diff --git a/loader/src/common/elf_util.cpp b/loader/src/common/elf_util.cpp index d265b3c..2ce61b8 100644 --- a/loader/src/common/elf_util.cpp +++ b/loader/src/common/elf_util.cpp @@ -187,7 +187,7 @@ ElfW(Addr) ElfImg::LinearLookup(std::string_view name) const { } } -std::string_view ElfImg::LinearLookupByPrefix(std::string_view name) const { +ElfW(Addr) ElfImg::LinearLookupByPrefix(std::string_view name) const { if (symtabs_.empty()) { symtabs_.reserve(symtab_count); if (symtab_start != nullptr && symstr_offset_for_symtab != 0) { @@ -207,11 +207,11 @@ std::string_view ElfImg::LinearLookupByPrefix(std::string_view name) const { if (symtab.first.size() < size) continue; if (symtab.first.substr(0, size) == name) { - return symtab.first; + return symtab.second->st_value; } } - return ""; + return 0; } diff --git a/loader/src/common/logging.cpp b/loader/src/common/logging.cpp deleted file mode 100644 index 887025f..0000000 --- a/loader/src/common/logging.cpp +++ /dev/null @@ -1,36 +0,0 @@ -#include -#include - -#include "logging.h" -#include "socket_utils.h" - -namespace logging { - static int logfd = -1; - - void setfd(int fd) { - close(logfd); - logfd = fd; - } - - int getfd() { - return logfd; - } - - void log(int prio, const char* tag, const char* fmt, ...) { - if (logfd == -1) { - va_list ap; - va_start(ap, fmt); - __android_log_vprint(prio, tag, fmt, ap); - va_end(ap); - } else { - char buf[BUFSIZ]; - va_list ap; - va_start(ap, fmt); - vsnprintf(buf, sizeof(buf), fmt, ap); - va_end(ap); - socket_utils::write_u8(logfd, prio); - socket_utils::write_string(logfd, tag); - socket_utils::write_string(logfd, buf); - } - } -} diff --git a/loader/src/include/daemon.h b/loader/src/include/daemon.h index dfb04cc..dad3c18 100644 --- a/loader/src/include/daemon.h +++ b/loader/src/include/daemon.h @@ -61,18 +61,23 @@ struct zygote_info { bool running; }; +enum mount_namespace_state { + Clean, + Rooted, + Module +}; + namespace zygiskd { - struct Module { + struct ModuleInfo { std::string name; UniqueFd memfd; - inline explicit Module(std::string name, int memfd) : name(name), memfd(memfd) {} + inline explicit ModuleInfo(std::string name, int memfd) : name(name), memfd(memfd) {} }; enum class SocketAction { PingHeartBeat, - RequestLogcatFd, GetProcessFlags, GetInfo, ReadModules, @@ -80,6 +85,7 @@ namespace zygiskd { GetModuleDir, ZygoteRestart, SystemServerStarted, + UpdateMountNamespace }; void Init(const char *path); @@ -88,9 +94,7 @@ namespace zygiskd { bool PingHeartbeat(); - int RequestLogcatFd(); - - std::vector ReadModules(); + std::vector ReadModules(); uint32_t GetProcessFlags(uid_t uid); @@ -103,4 +107,6 @@ namespace zygiskd { void SystemServerStarted(); void GetInfo(struct zygote_info *info); + + std::string UpdateMountNamespace(enum mount_namespace_state mns_state); } diff --git a/loader/src/include/elf_util.h b/loader/src/include/elf_util.h index 1b8c0b7..42a08c6 100644 --- a/loader/src/include/elf_util.h +++ b/loader/src/include/elf_util.h @@ -48,8 +48,13 @@ namespace SandHook { } } - std::string_view findSymbolNameByPrefix(std::string_view prefix) const { - return LinearLookupByPrefix(prefix); + constexpr ElfW(Addr) getSymbAddressByPrefix(std::string_view prefix) const { + ElfW(Addr) offset = LinearLookupByPrefix(prefix); + if (offset > 0 && base != nullptr) { + return static_cast((uintptr_t) base + offset - bias); + } else { + return 0; + } } template @@ -57,6 +62,11 @@ namespace SandHook { return reinterpret_cast(getSymbAddress(name)); } + template + constexpr T getSymbAddressByPrefix(std::string_view prefix) const { + return reinterpret_cast(getSymbAddressByPrefix(prefix)); + } + bool isValid() const { return base != nullptr; } @@ -76,7 +86,7 @@ namespace SandHook { ElfW(Addr) LinearLookup(std::string_view name) const; - std::string_view LinearLookupByPrefix(std::string_view name) const; + ElfW(Addr) LinearLookupByPrefix(std::string_view name) const; constexpr static uint32_t ElfHash(std::string_view name); diff --git a/loader/src/include/logging.h b/loader/src/include/logging.h index 0318bbe..687fdaf 100644 --- a/loader/src/include/logging.h +++ b/loader/src/include/logging.h @@ -1,35 +1,30 @@ -#pragma once +#ifndef LOGGING_H +#define LOGGING_H #include #include #include #ifndef LOG_TAG -#if defined(__LP64__) -# define LOG_TAG "zygisk-core64" -#else -# define LOG_TAG "zygisk-core32" -#endif + #ifdef __LP64__ + #define LOG_TAG "zygisk-core64" + #else + #define LOG_TAG "zygisk-core32" + #endif #endif #ifndef NDEBUG -#define LOGD(...) logging::log(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__) -#define LOGV(...) logging::log(ANDROID_LOG_VERBOSE, LOG_TAG, __VA_ARGS__) + #define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__) + #define LOGV(...) __android_log_print(ANDROID_LOG_VERBOSE, LOG_TAG, __VA_ARGS__) #else -#define LOGD(...) -#define LOGV(...) + #define LOGD(...) + #define LOGV(...) #endif -#define LOGI(...) logging::log(ANDROID_LOG_INFO, LOG_TAG, __VA_ARGS__) -#define LOGW(...) logging::log(ANDROID_LOG_WARN, LOG_TAG, __VA_ARGS__) -#define LOGE(...) logging::log(ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__) -#define LOGF(...) logging::log(ANDROID_LOG_FATAL, LOG_TAG, __VA_ARGS__) + +#define LOGI(...) __android_log_print(ANDROID_LOG_INFO, LOG_TAG, __VA_ARGS__) +#define LOGW(...) __android_log_print(ANDROID_LOG_WARN, LOG_TAG, __VA_ARGS__) +#define LOGE(...) __android_log_print(ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__) +#define LOGF(...) __android_log_print(ANDROID_LOG_FATAL, LOG_TAG, __VA_ARGS__) #define PLOGE(fmt, args...) LOGE(fmt " failed with %d: %s", ##args, errno, strerror(errno)) -namespace logging { - void setfd(int fd); - - int getfd(); - - [[gnu::format(printf, 3, 4)]] - void log(int prio, const char* tag, const char* fmt, ...); -} +#endif /* LOGGING_H */ \ No newline at end of file diff --git a/loader/src/include/solist.hpp b/loader/src/include/solist.hpp index f55d4b1..6835517 100644 --- a/loader/src/include/solist.hpp +++ b/loader/src/include/solist.hpp @@ -21,7 +21,6 @@ namespace SoList { #endif inline static const char *(*get_realpath_sym)(SoInfo *) = NULL; - inline static const char *(*get_soname_sym)(SoInfo *) = NULL; inline static void (*soinfo_free)(SoInfo *) = NULL; inline SoInfo *get_next() { @@ -38,12 +37,6 @@ namespace SoList { return ((std::string *) ((uintptr_t) this + solist_realpath_offset))->c_str(); } - inline const char *get_name() { - if (get_soname_sym) return get_soname_sym(this); - - return ((std::string *) ((uintptr_t) this + solist_realpath_offset - sizeof(void *)))->c_str(); - } - void set_next(SoInfo *si) { *(SoInfo **) ((uintptr_t) this + solist_next_offset) = si; } @@ -110,6 +103,13 @@ namespace SoList { return addr == NULL ? NULL : *addr; } + template + inline T *getStaticPointerByPrefix(const SandHook::ElfImg &linker, const char *name) { + auto *addr = reinterpret_cast(linker.getSymbAddressByPrefix(name)); + + return addr == NULL ? NULL : *addr; + } + static bool DropSoPath(const char* target_path) { bool path_found = false; if (solist == NULL && !Initialize()) { @@ -117,9 +117,9 @@ namespace SoList { return path_found; } for (auto iter = solist; iter; iter = iter->get_next()) { - if (iter->get_name() && iter->get_path() && strstr(iter->get_path(), target_path)) { + if (iter->get_path() && strstr(iter->get_path(), target_path)) { SoList::ProtectedDataGuard guard; - LOGI("dropping solist record for %s loaded at %s with size %zu", iter->get_name(), iter->get_path(), iter->get_size()); + LOGV("dropping solist record loaded at %s with size %zu", iter->get_path(), iter->get_size()); if (iter->get_size() > 0) { iter->set_size(0); SoInfo::soinfo_free(iter); @@ -136,7 +136,7 @@ namespace SoList { return; } if (g_module_load_counter == NULL || g_module_unload_counter == NULL) { - LOGI("g_module counters not defined, skip reseting them"); + LOGD("g_module counters not defined, skip reseting them"); return; } auto loaded_modules = *g_module_load_counter; @@ -163,57 +163,26 @@ namespace SoList { See #63 for more information. */ - - std::string_view solist_sym_name = linker.findSymbolNameByPrefix("__dl__ZL6solist"); - if (solist_sym_name.empty()) return false; - LOGD("found symbol name %s", solist_sym_name.data()); - - std::string_view soinfo_free_name = linker.findSymbolNameByPrefix("__dl__ZL11soinfo_freeP6soinfo"); - if (soinfo_free_name.empty()) return false; - LOGD("found symbol name %s", soinfo_free_name.data()); - - /* INFO: The size isn't a magic number, it's the size for the string: .llvm.7690929523238822858 */ - char llvm_sufix[25 + 1]; - - if (solist_sym_name.length() != strlen("__dl__ZL6solist")) { - strncpy(llvm_sufix, solist_sym_name.data() + strlen("__dl__ZL6solist"), sizeof(llvm_sufix)); - } else { - llvm_sufix[0] = '\0'; - } - - solist = getStaticPointer(linker, solist_sym_name.data()); + solist = getStaticPointerByPrefix(linker, "__dl__ZL6solist"); if (solist == NULL) return false; LOGD("found symbol solist"); - char somain_sym_name[sizeof("__dl__ZL6somain") + sizeof(llvm_sufix)]; - snprintf(somain_sym_name, sizeof(somain_sym_name), "__dl__ZL6somain%s", llvm_sufix); - - char sonext_sym_name[sizeof("__dl__ZL6sonext") + sizeof(llvm_sufix)]; - snprintf(sonext_sym_name, sizeof(somain_sym_name), "__dl__ZL6sonext%s", llvm_sufix); - - char vdso_sym_name[sizeof("__dl__ZL4vdso") + sizeof(llvm_sufix)]; - snprintf(vdso_sym_name, sizeof(vdso_sym_name), "__dl__ZL4vdso%s", llvm_sufix); - - somain = getStaticPointer(linker, somain_sym_name); + somain = getStaticPointerByPrefix(linker, "__dl__ZL6somain"); if (somain == NULL) return false; LOGD("found symbol somain"); - sonext = linker.getSymbAddress(sonext_sym_name); + sonext = linker.getSymbAddressByPrefix("__dl__ZL6sonext"); if (sonext == NULL) return false; LOGD("found symbol sonext"); - SoInfo *vdso = getStaticPointer(linker, vdso_sym_name); + SoInfo *vdso = getStaticPointerByPrefix(linker, "__dl__ZL4vdso"); if (vdso != NULL) LOGD("found symbol vdso"); SoInfo::get_realpath_sym = reinterpret_cast(linker.getSymbAddress("__dl__ZNK6soinfo12get_realpathEv")); if (SoInfo::get_realpath_sym == NULL) return false; LOGD("found symbol get_realpath_sym"); - SoInfo::get_soname_sym = reinterpret_cast(linker.getSymbAddress("__dl__ZNK6soinfo10get_sonameEv")); - if (SoInfo::get_soname_sym == NULL) return false; - LOGD("found symbol get_soname_sym"); - - SoInfo::soinfo_free = reinterpret_cast(linker.getSymbAddress(soinfo_free_name)); + SoInfo::soinfo_free = reinterpret_cast(linker.getSymbAddressByPrefix("__dl__ZL11soinfo_freeP6soinfo")); if (SoInfo::soinfo_free == NULL) return false; LOGD("found symbol soinfo_free"); diff --git a/loader/src/injector/entry.cpp b/loader/src/injector/entry.cpp index a927042..fabe209 100644 --- a/loader/src/injector/entry.cpp +++ b/loader/src/injector/entry.cpp @@ -9,7 +9,7 @@ size_t block_size = 0; extern "C" [[gnu::visibility("default")]] void entry(void* addr, size_t size, const char* path) { - LOGI("Zygisk library injected, version %s", ZKSU_VERSION); + LOGD("Zygisk library injected, version %s", ZKSU_VERSION); start_addr = addr; block_size = size; zygiskd::Init(path); @@ -19,11 +19,7 @@ void entry(void* addr, size_t size, const char* path) { return; } -#ifdef NDEBUG - logging::setfd(zygiskd::RequestLogcatFd()); -#endif - - LOGI("start plt hooking"); + LOGD("start plt hooking"); hook_functions(); clean_trace(path, 1, 0, false); } diff --git a/loader/src/injector/hook.cpp b/loader/src/injector/hook.cpp index 5255d37..5b77ba3 100644 --- a/loader/src/injector/hook.cpp +++ b/loader/src/injector/hook.cpp @@ -137,6 +137,36 @@ DCL_HOOK_FUNC(int, fork) { return (g_ctx && g_ctx->pid >= 0) ? g_ctx->pid : old_fork(); } +bool update_mnt_ns(enum mount_namespace_state mns_state, bool dry_run) { + std::string ns_path = zygiskd::UpdateMountNamespace(mns_state); + if (ns_path.empty()) { + PLOGE("Failed to update mount namespace"); + + return false; + } + + if (dry_run) return true; + + int updated_ns = open(ns_path.data(), O_RDONLY); + if (updated_ns == -1) { + PLOGE("Failed to open mount namespace [%s]", ns_path.data()); + + return false; + } + + LOGD("set mount namespace to [%s] fd=[%d]\n", ns_path.data(), updated_ns); + if (setns(updated_ns, CLONE_NEWNS) == -1) { + PLOGE("Failed to set mount namespace [%s]", ns_path.data()); + close(updated_ns); + + return false; + } + + close(updated_ns); + + return true; +} + // Unmount stuffs in the process's private mount namespace DCL_HOOK_FUNC(int, unshare, int flags) { int res = old_unshare(flags); @@ -144,37 +174,22 @@ DCL_HOOK_FUNC(int, unshare, int flags) { // For some unknown reason, unmounting app_process in SysUI can break. // This is reproducible on the official AVD running API 26 and 27. // Simply avoid doing any unmounts for SysUI to avoid potential issues. - (g_ctx->info_flags & PROCESS_IS_SYS_UI) == 0) { - if (g_ctx->flags[DO_REVERT_UNMOUNT]) { - if (g_ctx->info_flags & PROCESS_ROOT_IS_KSU) { - revert_unmount_ksu(); - } else if (g_ctx->info_flags & PROCESS_ROOT_IS_APATCH){ - revert_unmount_apatch(); - } else if (g_ctx->info_flags & PROCESS_ROOT_IS_MAGISK) { - revert_unmount_magisk(); - } + !g_ctx->flags[SERVER_FORK_AND_SPECIALIZE] && !(g_ctx->info_flags & PROCESS_IS_FIRST_STARTED)) { + if (g_ctx->info_flags & (PROCESS_IS_MANAGER | PROCESS_GRANTED_ROOT)) { + update_mnt_ns(Rooted, false); + } else if (!(g_ctx->flags[DO_REVERT_UNMOUNT])) { + update_mnt_ns(Module, false); } - /* Zygisksu changed: No umount app_process */ - - // Restore errno back to 0 - errno = 0; + old_unshare(CLONE_NEWNS); } + + /* INFO: To spoof the errno value */ + errno = 0; + return res; } -// Close logd_fd if necessary to prevent crashing -// For more info, check comments in zygisk_log_write -DCL_HOOK_FUNC(void, android_log_close) { - if (g_ctx == nullptr) { - // Happens during un-managed fork like nativeForkApp, nativeForkUsap - logging::setfd(-1); - } else if (!g_ctx->flags[SKIP_FD_SANITIZATION]) { - logging::setfd(-1); - } - old_android_log_close(); -} - // We cannot directly call `dlclose` to unload ourselves, otherwise when `dlclose` returns, // it will return to our code which has been unmapped, causing segmentation fault. // Instead, we hook `pthread_attr_setstacksize` which will be called when VM daemon threads start. @@ -189,11 +204,13 @@ DCL_HOOK_FUNC(int, pthread_attr_setstacksize, void *target, size_t size) { if (should_unmap_zygisk) { unhook_functions(); cached_map_infos.clear(); + if (should_unmap_zygisk) { // Because both `pthread_attr_setstacksize` and `dlclose` have the same function signature, // we can use `musttail` to let the compiler reuse our stack frame and thus // `dlclose` will directly return to the caller of `pthread_attr_setstacksize`. - LOGI("unmap libzygisk.so loaded at %p with size %zu", start_addr, block_size); + LOGD("unmap libzygisk.so loaded at %p with size %zu", start_addr, block_size); + [[clang::musttail]] return munmap(start_addr, block_size); } } @@ -598,14 +615,18 @@ void ZygiskContext::run_modules_post() { /* Zygisksu changed: Load module fds */ void ZygiskContext::app_specialize_pre() { flags[APP_SPECIALIZE] = true; + info_flags = zygiskd::GetProcessFlags(g_ctx->args.app->uid); + if (info_flags & PROCESS_IS_FIRST_STARTED) { + update_mnt_ns(Clean, true); + } if ((info_flags & PROCESS_ON_DENYLIST) == PROCESS_ON_DENYLIST) { - flags[DO_REVERT_UNMOUNT] = true; + flags[DO_REVERT_UNMOUNT] = true; } if ((info_flags & (PROCESS_IS_MANAGER | PROCESS_ROOT_IS_MAGISK)) == (PROCESS_IS_MANAGER | PROCESS_ROOT_IS_MAGISK)) { - LOGI("Manager process detected. Notifying that Zygisk has been enabled."); + LOGD("Manager process detected. Notifying that Zygisk has been enabled."); setenv("ZYGISK_ENABLED", "1", 1); } else { @@ -620,7 +641,6 @@ void ZygiskContext::app_specialize_post() { // Cleanups env->ReleaseStringUTFChars(args.app->nice_name, process); g_ctx = nullptr; - logging::setfd(-1); } bool ZygiskContext::exempt_fd(int fd) { @@ -653,11 +673,10 @@ void ZygiskContext::nativeForkSystemServer_pre() { flags[SERVER_FORK_AND_SPECIALIZE] = true; fork_pre(); - if (pid != 0) - return; - - run_modules_pre(); - zygiskd::SystemServerStarted(); + if (is_child()) { + run_modules_pre(); + zygiskd::SystemServerStarted(); + } sanitize_fds(); } @@ -673,12 +692,9 @@ void ZygiskContext::nativeForkSystemServer_post() { void ZygiskContext::nativeForkAndSpecialize_pre() { process = env->GetStringUTFChars(args.app->nice_name, nullptr); LOGV("pre forkAndSpecialize [%s]", process); - flags[APP_FORK_AND_SPECIALIZE] = true; - /* Zygisksu changed: No args.app->fds_to_ignore check since we are Android 10+ */ - if (logging::getfd() != -1) { - exempted_fds.push_back(logging::getfd()); - } + + update_mnt_ns(Clean, false); fork_pre(); if (pid == 0) { @@ -805,7 +821,6 @@ void hook_functions() { PLT_HOOK_REGISTER(android_runtime_dev, android_runtime_inode, fork); PLT_HOOK_REGISTER(android_runtime_dev, android_runtime_inode, unshare); PLT_HOOK_REGISTER(android_runtime_dev, android_runtime_inode, strdup); - PLT_HOOK_REGISTER_SYM(android_runtime_dev, android_runtime_inode, "__android_log_close", android_log_close); hook_commit(); // Remove unhooked methods diff --git a/loader/src/injector/module.hpp b/loader/src/injector/module.hpp index 24111fc..f02bd7d 100644 --- a/loader/src/injector/module.hpp +++ b/loader/src/injector/module.hpp @@ -126,13 +126,13 @@ namespace { PROCESS_GRANTED_ROOT = zygisk::StateFlag::PROCESS_GRANTED_ROOT, PROCESS_ON_DENYLIST = zygisk::StateFlag::PROCESS_ON_DENYLIST, - PROCESS_IS_MANAGER = (1u << 28), - PROCESS_ROOT_IS_APATCH = (1u << 27), + PROCESS_IS_MANAGER = (1u << 27), + PROCESS_ROOT_IS_APATCH = (1u << 28), PROCESS_ROOT_IS_KSU = (1u << 29), PROCESS_ROOT_IS_MAGISK = (1u << 30), - PROCESS_IS_SYS_UI = (1u << 31), + PROCESS_IS_FIRST_STARTED = (1u << 31), - PRIVATE_MASK = PROCESS_IS_SYS_UI + PRIVATE_MASK = PROCESS_IS_FIRST_STARTED }; struct api_abi_base { diff --git a/loader/src/injector/unmount.cpp b/loader/src/injector/unmount.cpp deleted file mode 100644 index a657467..0000000 --- a/loader/src/injector/unmount.cpp +++ /dev/null @@ -1,145 +0,0 @@ -#include -#include - -#include "files.hpp" -#include "logging.h" -#include "misc.hpp" -#include "zygisk.hpp" - -using namespace std::string_view_literals; - -namespace { - constexpr auto MODULE_DIR = "/data/adb/modules"; - constexpr auto KSU_OVERLAY_SOURCE = "KSU"; - constexpr auto AP_OVERLAY_SOURCE = "APatch"; - const std::vector DEVICE_PARTITIONS{"/system", "/vendor", "/product", "/system_ext", "/odm", "/oem"}; - - void lazy_unmount(const char* mountpoint) { - if (umount2(mountpoint, MNT_DETACH) != -1) { - LOGD("Unmounted (%s)", mountpoint); - } else { -#ifndef NDEBUG - PLOGE("Unmount (%s)", mountpoint); -#endif - } - } -} - -void revert_unmount_ksu() { - std::string ksu_loop; - std::vector targets; - - // Unmount ksu module dir last - targets.emplace_back(MODULE_DIR); - - for (auto& info: parse_mount_info("self")) { - if (info.target == MODULE_DIR) { - ksu_loop = info.source; - continue; - } - - // Unmount everything mounted to /data/adb - if (info.target.starts_with("/data/adb")) { - targets.emplace_back(info.target); - } - - // Unmount everything mounted to /data/adb - if (info.root.starts_with("/adb/modules")) { - targets.emplace_back(info.target); - } - - // Unmount ksu overlays - if (info.type == "overlay" - && info.source == KSU_OVERLAY_SOURCE - && std::find(DEVICE_PARTITIONS.begin(), DEVICE_PARTITIONS.end(), info.target) != DEVICE_PARTITIONS.end()) { - targets.emplace_back(info.target); - } - - // Unmount temp dir - if (info.type == "tmpfs" && info.source == KSU_OVERLAY_SOURCE) { - targets.emplace_back(info.target); - } - } - - for (auto& info: parse_mount_info("self")) { - // Unmount everything from ksu loop except ksu module dir - if (info.source == ksu_loop && info.target != MODULE_DIR) { - targets.emplace_back(info.target); - } - } - - // Do unmount - for (auto& s: reversed(targets)) { - lazy_unmount(s.data()); - } -} - -void revert_unmount_magisk() { - std::vector targets; - - // Unmount dummy skeletons and MAGISKTMP - // since mirror nodes are always mounted under skeleton, we don't have to specifically unmount - for (auto& info: parse_mount_info("self")) { - if (info.source == "magisk" || info.source == "worker" || // magisktmp tmpfs - info.root.starts_with("/adb/modules")) { // bind mount from data partition - targets.push_back(info.target); - } - // Unmount everything mounted to /data/adb - if (info.target.starts_with("/data/adb")) { - targets.emplace_back(info.target); - } - } - - for (auto& s: reversed(targets)) { - lazy_unmount(s.data()); - } -} - -void revert_unmount_apatch() { - std::string ap_loop; - std::vector targets; - - // Unmount ksu module dir last - targets.emplace_back(MODULE_DIR); - - for (auto& info: parse_mount_info("self")) { - if (info.target == MODULE_DIR) { - ap_loop = info.source; - continue; - } - - // Unmount everything mounted to /data/adb - if (info.target.starts_with("/data/adb")) { - targets.emplace_back(info.target); - } - - // Unmount everything mounted to /data/adb - if (info.root.starts_with("/adb/modules")) { - targets.emplace_back(info.target); - } - - // Unmount ksu overlays - if (info.type == "overlay" - && info.source == AP_OVERLAY_SOURCE - && std::find(DEVICE_PARTITIONS.begin(), DEVICE_PARTITIONS.end(), info.target) != DEVICE_PARTITIONS.end()) { - targets.emplace_back(info.target); - } - - // Unmount temp dir - if (info.type == "tmpfs" && info.source == AP_OVERLAY_SOURCE) { - targets.emplace_back(info.target); - } - } - - for (auto& info: parse_mount_info("self")) { - // Unmount everything from ksu loop except ksu module dir - if (info.source == ap_loop && info.target != MODULE_DIR) { - targets.emplace_back(info.target); - } - } - - // Do unmount - for (auto& s: reversed(targets)) { - lazy_unmount(s.data()); - } -} diff --git a/loader/src/injector/zygisk.hpp b/loader/src/injector/zygisk.hpp index 793ba78..d171890 100644 --- a/loader/src/injector/zygisk.hpp +++ b/loader/src/injector/zygisk.hpp @@ -8,9 +8,3 @@ extern size_t block_size; void hook_functions(); void clean_trace(const char* path, size_t load = 1, size_t unload = 0, bool spoof_maps = false); - -void revert_unmount_ksu(); - -void revert_unmount_magisk(); - -void revert_unmount_apatch(); diff --git a/module/src/sepolicy.rule b/module/src/sepolicy.rule index 48669a6..859f87f 100644 --- a/module/src/sepolicy.rule +++ b/module/src/sepolicy.rule @@ -1,21 +1,15 @@ -allow zygote tmpfs file * -allow zygote appdomain_tmpfs file * +type zygisk_file file_type +typeattribute zygisk_file mlstrustedobject +allow zygote zygisk_file sock_file {read write} -type magisk_file file_type -typeattribute magisk_file mlstrustedobject - -allow * magisk_file file * -allow * magisk_file dir * -allow * magisk_file fifo_file * -allow * magisk_file chr_file * -allow * magisk_file lnk_file * -allow * magisk_file sock_file * - -allow system_server system_server process execmem -allow zygote zygote process execmem +allow zygote magisk lnk_file read +allow zygote unlabeled file {read open} +allow zygote zygote capability sys_chroot +allow zygote su dir search +allow zygote su {lnk_file file} read allow zygote adb_data_file dir search -allow zygote mnt_vendor_file dir search -allow zygote system_file dir mounton -allow zygote labeledfs filesystem mount -allow zygote fs_type filesystem unmount +allow zygote zygote process execmem +allow system_server system_server process execmem +allow zygote tmpfs file * +allow zygote appdomain_tmpfs file * diff --git a/zygiskd/build.gradle.kts b/zygiskd/build.gradle.kts index b830189..a3a2984 100644 --- a/zygiskd/build.gradle.kts +++ b/zygiskd/build.gradle.kts @@ -42,7 +42,7 @@ val CFlagsRelease = arrayOf( ) val CFlagsDebug = arrayOf( - "-g", "-O0" + "-g", "-O0", "-DDEBUG" ) val Files = arrayOf( diff --git a/zygiskd/src/constants.h b/zygiskd/src/constants.h index 8342ebb..71e3f29 100644 --- a/zygiskd/src/constants.h +++ b/zygiskd/src/constants.h @@ -7,12 +7,6 @@ #define true 1 #define false 0 -#if DEBUG == false - #define MAX_LOG_LEVEL ANDROID_LOG_VERBOSE -#else - #define MAX_LOG_LEVEL ANDROID_LOG_INFO -#endif - #if (defined(__LP64__) || defined(_LP64)) #define lp_select(a, b) b #else @@ -26,25 +20,24 @@ enum DaemonSocketAction { PingHeartbeat = 0, - RequestLogcatFd = 1, - GetProcessFlags = 2, - GetInfo = 3, - ReadModules = 4, - RequestCompanionSocket = 5, - GetModuleDir = 6, - ZygoteRestart = 7, - SystemServerStarted = 8 + GetProcessFlags = 1, + GetInfo = 2, + ReadModules = 3, + RequestCompanionSocket = 4, + GetModuleDir = 5, + ZygoteRestart = 6, + SystemServerStarted = 7, + GetCleanNamespace = 8 }; enum ProcessFlags: uint32_t { PROCESS_GRANTED_ROOT = (1u << 0), PROCESS_ON_DENYLIST = (1u << 1), - PROCESS_IS_MANAGER = (1u << 28), - PROCESS_ROOT_IS_APATCH = (1u << 27), + PROCESS_IS_MANAGER = (1u << 27), + PROCESS_ROOT_IS_APATCH = (1u << 28), PROCESS_ROOT_IS_KSU = (1u << 29), PROCESS_ROOT_IS_MAGISK = (1u << 30), - PROCESS_IS_SYS_UI = (1u << 31), - PROCESS_IS_SYSUI = (1u << 31) + PROCESS_IS_FIRST_STARTED = (1u << 31) }; enum RootImplState { @@ -54,4 +47,10 @@ enum RootImplState { Abnormal }; +enum MountNamespaceState { + Clean, + Rooted, + Module +}; + #endif /* CONSTANTS_H */ diff --git a/zygiskd/src/root_impl/common.c b/zygiskd/src/root_impl/common.c index e679f55..2198bdc 100644 --- a/zygiskd/src/root_impl/common.c +++ b/zygiskd/src/root_impl/common.c @@ -1,6 +1,9 @@ #include +#include +#include #include +#include #include "../utils.h" #include "kernelsu.h" diff --git a/zygiskd/src/utils.c b/zygiskd/src/utils.c index d0e7eba..6922599 100644 --- a/zygiskd/src/utils.c +++ b/zygiskd/src/utils.c @@ -3,11 +3,13 @@ #include #include #include +#include #include #include #include #include -#include +#include +#include #include #include @@ -18,6 +20,11 @@ #include "utils.h" #include "root_impl/common.h" +#include "root_impl/magisk.h" + +int clean_namespace_fd = 0; +int rooted_namespace_fd = 0; +int module_namespace_fd = 0; bool switch_mount_namespace(pid_t pid) { char path[PATH_MAX]; @@ -184,7 +191,7 @@ int unix_listener_from_path(char *restrict path) { return -1; } - if (chcon(path, "u:object_r:magisk_file:s0") == -1) { + if (chcon(path, "u:object_r:zygisk_file:s0") == -1) { LOGE("chcon: %s\n", strerror(errno)); return -1; @@ -450,3 +457,381 @@ void stringify_root_impl_name(struct root_impl impl, char *restrict output) { } } } + +struct mountinfo { + unsigned int id; + unsigned int parent; + dev_t device; + const char *root; + const char *target; + const char *vfs_option; + struct { + unsigned int shared; + unsigned int master; + unsigned int propagate_from; + } optional; + const char *type; + const char *source; + const char *fs_option; +}; + +struct mountinfos { + struct mountinfo *mounts; + size_t length; +}; + +char *strndup(const char *restrict str, size_t length) { + char *restrict copy = malloc(length + 1); + if (copy == NULL) return NULL; + + memcpy(copy, str, length); + copy[length] = '\0'; + + return copy; +} + +void free_mounts(struct mountinfos *restrict mounts) { + for (size_t i = 0; i < mounts->length; i++) { + free((void *)mounts->mounts[i].root); + free((void *)mounts->mounts[i].target); + free((void *)mounts->mounts[i].vfs_option); + free((void *)mounts->mounts[i].type); + free((void *)mounts->mounts[i].source); + free((void *)mounts->mounts[i].fs_option); + } + + free((void *)mounts->mounts); +} + +bool parse_mountinfo(const char *restrict pid, struct mountinfos *restrict mounts) { + char path[PATH_MAX]; + snprintf(path, PATH_MAX, "/proc/%s/mountinfo", pid); + + FILE *mountinfo = fopen(path, "r"); + if (mountinfo == NULL) { + LOGE("fopen: %s\n", strerror(errno)); + + return false; + } + + char line[PATH_MAX]; + size_t i = 0; + + mounts->mounts = NULL; + mounts->length = 0; + + while (fgets(line, sizeof(line), mountinfo) != NULL) { + int root_start = 0, root_end = 0; + int target_start = 0, target_end = 0; + int vfs_option_start = 0, vfs_option_end = 0; + int type_start = 0, type_end = 0; + int source_start = 0, source_end = 0; + int fs_option_start = 0, fs_option_end = 0; + int optional_start = 0, optional_end = 0; + unsigned int id, parent, maj, min; + sscanf(line, + "%u " // (1) id + "%u " // (2) parent + "%u:%u " // (3) maj:min + "%n%*s%n " // (4) mountroot + "%n%*s%n " // (5) target + "%n%*s%n" // (6) vfs options (fs-independent) + "%n%*[^-]%n - " // (7) optional fields + "%n%*s%n " // (8) FS type + "%n%*s%n " // (9) source + "%n%*s%n", // (10) fs options (fs specific) + &id, &parent, &maj, &min, &root_start, &root_end, &target_start, + &target_end, &vfs_option_start, &vfs_option_end, + &optional_start, &optional_end, &type_start, &type_end, + &source_start, &source_end, &fs_option_start, &fs_option_end); + + mounts->mounts = (struct mountinfo *)realloc(mounts->mounts, (i + 1) * sizeof(struct mountinfo)); + if (!mounts->mounts) { + LOGE("Failed to allocate memory for mounts->mounts"); + + fclose(mountinfo); + free_mounts(mounts); + + return false; + } + + unsigned int shared = 0; + unsigned int master = 0; + unsigned int propagate_from = 0; + if (strstr(line + optional_start, "shared:")) { + shared = (unsigned int)atoi(strstr(line + optional_start, "shared:") + 7); + } + + if (strstr(line + optional_start, "master:")) { + master = (unsigned int)atoi(strstr(line + optional_start, "master:") + 7); + } + + if (strstr(line + optional_start, "propagate_from:")) { + propagate_from = (unsigned int)atoi(strstr(line + optional_start, "propagate_from:") + 15); + } + + mounts->mounts[i].id = id; + mounts->mounts[i].parent = parent; + mounts->mounts[i].device = (dev_t)(makedev(maj, min)); + mounts->mounts[i].root = strndup(line + root_start, (size_t)(root_end - root_start)); + mounts->mounts[i].target = strndup(line + target_start, (size_t)(target_end - target_start)); + mounts->mounts[i].vfs_option = strndup(line + vfs_option_start, (size_t)(vfs_option_end - vfs_option_start)); + mounts->mounts[i].optional.shared = shared; + mounts->mounts[i].optional.master = master; + mounts->mounts[i].optional.propagate_from = propagate_from; + mounts->mounts[i].type = strndup(line + type_start, (size_t)(type_end - type_start)); + mounts->mounts[i].source = strndup(line + source_start, (size_t)(source_end - source_start)); + mounts->mounts[i].fs_option = strndup(line + fs_option_start, (size_t)(fs_option_end - fs_option_start)); + + i++; + } + + fclose(mountinfo); + + mounts->length = i; + + return true; +} + +enum mns_umount_state { + Complete, + NotComplete, + Error +}; + +enum mns_umount_state unmount_root(bool modules_only, struct root_impl impl) { + /* INFO: We are already in the target pid mount namespace, so actually, + when we use self here, we meant its pid. + */ + struct mountinfos mounts; + if (!parse_mountinfo("self", &mounts)) { + LOGE("Failed to parse mountinfo\n"); + + return Error; + } + + /* INFO: Implementations like Magisk Kitsune will mount MagiskSU when boot is completed, + so if we cache the clean mount done before the boot is completed, it will get + it mounted later and hence it will leak mounts. To avoid that we will detect + if implementation is Kitsune, and if so, see if /system/bin... is mounted, + if not, it won't cache this namespace. */ + bool magiskSU_umounted = false; + + switch (impl.impl) { + case None: { break; } + case Multiple: { break; } + + case KernelSU: + case APatch: { + char source_name[LONGEST_ROOT_IMPL_NAME]; + if (impl.impl == KernelSU) strcpy(source_name, "KSU"); + else strcpy(source_name, "APatch"); + + const char **targets_to_unmount = NULL; + size_t num_targets = 0; + + for (size_t i = 0; i < mounts.length; i++) { + struct mountinfo mount = mounts.mounts[i]; + + bool should_unmount = false; + + if (modules_only) { + if (strncmp(mount.target, "/debug_ramdisk", strlen("/debug_ramdisk")) == 0) + should_unmount = true; + } else { + if (strcmp(mount.source, source_name) == 0) should_unmount = true; + if (strncmp(mount.root, "/adb/modules", strlen("/adb/modules")) == 0) should_unmount = true; + if (strncmp(mount.target, "/data/adb/modules", strlen("/data/adb/modules")) == 0) should_unmount = true; + } + + if (!should_unmount) continue; + + num_targets++; + targets_to_unmount = realloc(targets_to_unmount, num_targets * sizeof(char*)); + if (targets_to_unmount == NULL) { + LOGE("[%s] Failed to allocate memory for targets_to_unmount\n", source_name); + + free(targets_to_unmount); + free_mounts(&mounts); + + return Error; + } + + targets_to_unmount[num_targets - 1] = mount.target; + } + + for (size_t i = num_targets; i > 0; i--) { + const char *target = targets_to_unmount[i - 1]; + + if (umount2(target, MNT_DETACH) == -1) { + LOGE("[%s] Failed to unmount %s: %s\n", source_name, target, strerror(errno)); + } else { + LOGI("[%s] Unmounted %s\n", source_name, target); + } + } + free(targets_to_unmount); + + break; + } + case Magisk: { + LOGI("[Magisk] Unmounting root %s modules\n", modules_only ? "only" : "with"); + + const char **targets_to_unmount = NULL; + size_t num_targets = 0; + + for (size_t i = 0; i < mounts.length; i++) { + struct mountinfo mount = mounts.mounts[i]; + + bool should_unmount = false; + if ( + ( + modules_only && + ( + strcmp(mount.source, "magisk") == 0 || + strncmp(mount.target, "/debug_ramdisk", strlen("/debug_ramdisk")) == 0 || + strncmp(mount.target, "/system/bin", strlen("/system/bin")) == 0 + ) + ) || + ( + !modules_only && + ( + strcmp(mount.source, "magisk") == 0 || + strncmp(mount.target, "/debug_ramdisk", strlen("/debug_ramdisk")) == 0 || + strncmp(mount.target, "/data/adb/modules", strlen("/data/adb/modules")) == 0 || + strncmp(mount.root, "/adb/modules", strlen("/adb/modules")) == 0 || + strncmp(mount.target, "/system/bin", strlen("/system/bin")) == 0 + ) + ) + ) { + should_unmount = true; + } + + if (!should_unmount) continue; + + num_targets++; + targets_to_unmount = realloc(targets_to_unmount, num_targets * sizeof(char*)); + if (targets_to_unmount == NULL) { + LOGE("[Magisk] Failed to allocate memory for targets_to_unmount\n"); + + free(targets_to_unmount); + free_mounts(&mounts); + + return Error; + } + + targets_to_unmount[num_targets - 1] = mount.target; + + if (impl.impl == Magisk && strncmp(mount.target, "/system/bin", strlen("/system/bin")) == 0) + magiskSU_umounted = true; + } + + for (size_t i = num_targets; i > 0; i--) { + const char *target = targets_to_unmount[i - 1]; + if (umount2(target, MNT_DETACH) == -1) { + LOGE("[Magisk] Failed to unmount %s: %s\n", target, strerror(errno)); + } else { + LOGI("[Magisk] Unmounted %s\n", target); + } + } + free(targets_to_unmount); + + break; + } + } + + free_mounts(&mounts); + + return (impl.impl == Magisk && !magiskSU_umounted) ? NotComplete : Complete; +} + +int save_mns_fd(int pid, enum MountNamespaceState mns_state, struct root_impl impl) { + if (mns_state == Clean && clean_namespace_fd != 0) return clean_namespace_fd; + if (mns_state == Rooted && rooted_namespace_fd != 0) return rooted_namespace_fd; + if (mns_state == Module && module_namespace_fd != 0) return module_namespace_fd; + + int sockets[2]; + if (socketpair(AF_UNIX, SOCK_STREAM, 0, sockets) == -1) { + LOGE("socketpair: %s\n", strerror(errno)); + + return -1; + } + + int reader = sockets[0]; + int writer = sockets[1]; + + pid_t fork_pid = fork(); + if (fork_pid == 0) { + switch_mount_namespace(pid); + + enum mns_umount_state umount_state = Complete; + + if (mns_state != Rooted) { + unshare(CLONE_NEWNS); + umount_state = unmount_root(mns_state == Module, impl); + if (umount_state == Error) { + write_uint8_t(writer, (uint8_t)umount_state); + + _exit(1); + } + } + + uint32_t mypid = 0; + while (mypid != (uint32_t)getpid()) { + write_uint8_t(writer, (uint8_t)umount_state); + usleep(50); + read_uint32_t(reader, &mypid); + } + + _exit(0); + } else if (fork_pid > 0) { + enum mns_umount_state umount_state = (enum mns_umount_state)0; + read_uint8_t(reader, (uint8_t *)&umount_state); + + if (umount_state == Error) { + LOGE("Failed to unmount root\n"); + + return -1; + } + + char ns_path[PATH_MAX]; + snprintf(ns_path, PATH_MAX, "/proc/%d/ns/mnt", fork_pid); + + int ns_fd = open(ns_path, O_RDONLY); + if (ns_fd == -1) { + LOGE("open: %s\n", strerror(errno)); + + return -1; + } + + write_uint32_t(writer, (uint32_t)fork_pid); + + if (close(reader) == -1) { + LOGE("Failed to close reader: %s\n", strerror(errno)); + + return -1; + } + + if (close(writer) == -1) { + LOGE("Failed to close writer: %s\n", strerror(errno)); + + return -1; + } + + if (waitpid(fork_pid, NULL, 0) == -1) { + LOGE("waitpid: %s\n", strerror(errno)); + + return -1; + } + + if (mns_state == Rooted) return (rooted_namespace_fd = ns_fd); + else if (mns_state == Clean && umount_state == Complete) return (clean_namespace_fd = ns_fd); + else if (mns_state == Module && umount_state == Complete) return (module_namespace_fd = ns_fd); + else return ns_fd; + } else { + LOGE("fork: %s\n", strerror(errno)); + + return -1; + } + + return -1; +} diff --git a/zygiskd/src/utils.h b/zygiskd/src/utils.h index 7cc6bbf..1d8bebb 100644 --- a/zygiskd/src/utils.h +++ b/zygiskd/src/utils.h @@ -107,4 +107,6 @@ int non_blocking_execv(const char *restrict file, char *const argv[]); void stringify_root_impl_name(struct root_impl impl, char *restrict output); +int save_mns_fd(int pid, enum MountNamespaceState mns_state, struct root_impl impl); + #endif /* UTILS_H */ diff --git a/zygiskd/src/zygiskd.c b/zygiskd/src/zygiskd.c index 0c0d952..429c143 100644 --- a/zygiskd/src/zygiskd.c +++ b/zygiskd/src/zygiskd.c @@ -382,6 +382,7 @@ void zygiskd_start(char *restrict argv[]) { return; } + bool first_process = true; while (1) { int client_fd = accept(socket_fd, NULL, NULL); if (client_fd == -1) { @@ -437,51 +438,26 @@ void zygiskd_start(char *restrict argv[]) { break; } - /* TODO: Move to another thread and save client fds to an epoll list - so that we can, in a single-thread, deal with multiple logcats */ - case RequestLogcatFd: { - uint8_t level = 0; - ssize_t ret = read_uint8_t(client_fd, &level); - ASSURE_SIZE_READ_BREAK("RequestLogcatFd", "level", ret, sizeof(level)); - - char tag[128 + 1]; - ret = read_string(client_fd, tag, sizeof(tag)); - if (ret == -1) { - LOGE("Failed reading logcat tag.\n"); - - close(client_fd); - - break; - } - - char message[1024 + 1]; - ret = read_string(client_fd, message, sizeof(message)); - if (ret == -1) { - LOGE("Failed reading logcat message.\n"); - - close(client_fd); - - break; - } - - __android_log_print(level, tag, "%s", message); - - break; - } case GetProcessFlags: { uint32_t uid = 0; ssize_t ret = read_uint32_t(client_fd, &uid); ASSURE_SIZE_READ_BREAK("GetProcessFlags", "uid", ret, sizeof(uid)); uint32_t flags = 0; - if (uid_is_manager(uid)) { - flags |= PROCESS_IS_MANAGER; + if (first_process) { + flags |= PROCESS_IS_FIRST_STARTED; + + first_process = false; } else { - if (uid_granted_root(uid)) { - flags |= PROCESS_GRANTED_ROOT; - } - if (uid_should_umount(uid)) { - flags |= PROCESS_ON_DENYLIST; + if (uid_is_manager(uid)) { + flags |= PROCESS_IS_MANAGER; + } else { + if (uid_granted_root(uid)) { + flags |= PROCESS_GRANTED_ROOT; + } + if (uid_should_umount(uid)) { + flags |= PROCESS_ON_DENYLIST; + } } } @@ -671,11 +647,35 @@ void zygiskd_start(char *restrict argv[]) { break; } + break; + } + case GetCleanNamespace: { + pid_t pid = 0; + ssize_t ret = read_uint32_t(client_fd, (uint32_t *)&pid); + ASSURE_SIZE_READ_BREAK("GetCleanNamespace", "pid", ret, sizeof(pid)); + + uint8_t mns_state = 0; + ret = read_uint8_t(client_fd, &mns_state); + ASSURE_SIZE_READ_BREAK("GetCleanNamespace", "mns_state", ret, sizeof(mns_state)); + + uint32_t our_pid = (uint32_t)getpid(); + ret = write_uint32_t(client_fd, (uint32_t)our_pid); + ASSURE_SIZE_WRITE_BREAK("GetCleanNamespace", "our_pid", ret, sizeof(our_pid)); + + if ((enum MountNamespaceState)mns_state == Clean) { + save_mns_fd(pid, Rooted, impl); + save_mns_fd(pid, Module, impl); + } + + uint32_t clean_namespace_fd = (uint32_t)save_mns_fd(pid, (enum MountNamespaceState)mns_state, impl); + ret = write_uint32_t(client_fd, clean_namespace_fd); + ASSURE_SIZE_WRITE_BREAK("GetCleanNamespace", "clean_namespace_fd", ret, sizeof(clean_namespace_fd)); + break; } } - if (action != RequestCompanionSocket && action != RequestLogcatFd) close(client_fd); + if (action != RequestCompanionSocket) close(client_fd); continue; } From 52885faf8b1f8c0598a8b6b802c9cfb7aed27aad Mon Sep 17 00:00:00 2001 From: ThePedroo Date: Sat, 5 Apr 2025 15:36:39 -0300 Subject: [PATCH 31/46] remove: `dl.cpp` file and replace with "dlopen" This commit replaces DlopenMem for dlopen, removing the need for "dl.cpp" file. --- loader/src/common/daemon.cpp | 5 +-- loader/src/common/dl.cpp | 77 ------------------------------------ loader/src/include/daemon.h | 5 ++- loader/src/include/dl.h | 7 ---- loader/src/injector/hook.cpp | 50 +++++++++++++---------- zygiskd/src/zygiskd.c | 22 +++++++++-- 6 files changed, 52 insertions(+), 114 deletions(-) delete mode 100644 loader/src/common/dl.cpp delete mode 100644 loader/src/include/dl.h diff --git a/loader/src/common/daemon.cpp b/loader/src/common/daemon.cpp index bd558ca..44c7660 100644 --- a/loader/src/common/daemon.cpp +++ b/loader/src/common/daemon.cpp @@ -7,7 +7,6 @@ #include #include "daemon.h" -#include "dl.h" #include "socket_utils.h" namespace zygiskd { @@ -93,9 +92,9 @@ namespace zygiskd { socket_utils::write_u8(fd, (uint8_t) SocketAction::ReadModules); size_t len = socket_utils::read_usize(fd); for (size_t i = 0; i < len; i++) { + std::string lib_path = socket_utils::read_string(fd); std::string name = socket_utils::read_string(fd); - int module_fd = socket_utils::recv_fd(fd); - modules.emplace_back(name, module_fd); + modules.emplace_back(lib_path, name); } close(fd); diff --git a/loader/src/common/dl.cpp b/loader/src/common/dl.cpp deleted file mode 100644 index 352b8f9..0000000 --- a/loader/src/common/dl.cpp +++ /dev/null @@ -1,77 +0,0 @@ -#include -#include -#include -#include -#include -#include - -#include "dl.h" -#include "files.hpp" -#include "logging.h" - -extern "C" [[gnu::weak]] struct android_namespace_t* -//NOLINTNEXTLINE -__loader_android_create_namespace([[maybe_unused]] const char* name, - [[maybe_unused]] const char* ld_library_path, - [[maybe_unused]] const char* default_library_path, - [[maybe_unused]] uint64_t type, - [[maybe_unused]] const char* permitted_when_isolated_path, - [[maybe_unused]] android_namespace_t* parent, - [[maybe_unused]] const void* caller_addr); - -void* DlopenExt(const char* path, int flags) { - auto info = android_dlextinfo{}; - auto* dir = dirname(path); - auto* ns = &__loader_android_create_namespace == nullptr ? nullptr : - __loader_android_create_namespace(path, dir, nullptr, - 2, /* ANDROID_NAMESPACE_TYPE_SHARED */ - nullptr, nullptr, - reinterpret_cast(&DlopenExt)); - if (ns) { - info.flags = ANDROID_DLEXT_USE_NAMESPACE; - info.library_namespace = ns; - - LOGD("Open %s with namespace %p", path, ns); - } else { - LOGD("Cannot create namespace for %s", path); - } - - auto* handle = android_dlopen_ext(path, flags, &info); - if (handle) { - LOGD("dlopen %s: %p", path, handle); - } else { - LOGE("dlopen %s: %s", path, dlerror()); - } - return handle; -} - -void* DlopenMem(int fd, int flags) { - auto info = android_dlextinfo { - .flags = ANDROID_DLEXT_USE_LIBRARY_FD, - .reserved_addr = NULL, - .reserved_size = 0, - .relro_fd = 0, - .library_fd = fd, - .library_fd_offset = 0, - .library_namespace = NULL - }; - - /* INFO: We need to find the path of the fd since passing "" to android_dlopen_ext - will not work and passing the original "jit-cache-zygisk" will cause a detection again. */ - char path[PATH_MAX]; - if (get_path_from_fd(fd, path, sizeof(path)) != 0) { - LOGE("Failed to get path for fd: %d", fd); - return NULL; - } - - LOGD("Path for fd %d: %s", fd, path); - - auto *handle = android_dlopen_ext(path, flags, &info); - if (handle) { - LOGV("dlopen fd %d: %p", fd, handle); - } else { - LOGE("dlopen fd %d: %s", fd, dlerror()); - } - - return handle; -} diff --git a/loader/src/include/daemon.h b/loader/src/include/daemon.h index dad3c18..9bc3617 100644 --- a/loader/src/include/daemon.h +++ b/loader/src/include/daemon.h @@ -70,10 +70,11 @@ enum mount_namespace_state { namespace zygiskd { struct ModuleInfo { + std::string path; + /* TODO: Perhaps we can also remove this and just send paths? */ std::string name; - UniqueFd memfd; - inline explicit ModuleInfo(std::string name, int memfd) : name(name), memfd(memfd) {} + inline explicit ModuleInfo(std::string path, std::string name) : path(path), name(name) {} }; enum class SocketAction { diff --git a/loader/src/include/dl.h b/loader/src/include/dl.h deleted file mode 100644 index 25dd6c6..0000000 --- a/loader/src/include/dl.h +++ /dev/null @@ -1,7 +0,0 @@ -#pragma once - -#include - -void *DlopenExt(const char *path, int flags); - -void *DlopenMem(int memfd, int flags); diff --git a/loader/src/injector/hook.cpp b/loader/src/injector/hook.cpp index 5b77ba3..c3282c1 100644 --- a/loader/src/injector/hook.cpp +++ b/loader/src/injector/hook.cpp @@ -15,7 +15,6 @@ #include #include -#include "dl.h" #include "daemon.h" #include "zygisk.hpp" #include "module.hpp" @@ -573,24 +572,35 @@ void ZygiskContext::fork_post() { /* Zygisksu changed: Load module fds */ void ZygiskContext::run_modules_pre() { - auto ms = zygiskd::ReadModules(); - auto size = ms.size(); - for (size_t i = 0; i < size; i++) { - auto& m = ms[i]; - if (void* handle = DlopenMem(m.memfd, RTLD_NOW); - void* entry = handle ? dlsym(handle, "zygisk_module_entry") : nullptr) { - modules.emplace_back(i, handle, entry); - } + auto ms = zygiskd::ReadModules(); + auto size = ms.size(); + for (size_t i = 0; i < size; i++) { + auto &m = ms[i]; + + void *handle = dlopen(m.path.c_str(), RTLD_NOW); + if (!handle) { + LOGE("Failed to load module [%s]: %s", m.path.c_str(), dlerror()); + + continue; } - for (auto &m : modules) { - m.onLoad(env); - if (flags[APP_SPECIALIZE]) { - m.preAppSpecialize(args.app); - } else if (flags[SERVER_FORK_AND_SPECIALIZE]) { - m.preServerSpecialize(args.server); - } + void *entry = dlsym(handle, "zygisk_module_entry"); + if (!entry) { + LOGE("Failed to find entry point in module [%s]: %s", m.path.c_str(), dlerror()); + + dlclose(handle); + + continue; } + + modules.emplace_back(i, handle, entry); + } + + for (auto &m : modules) { + m.onLoad(env); + if (flags[APP_SPECIALIZE]) m.preAppSpecialize(args.app); + else if (flags[SERVER_FORK_AND_SPECIALIZE]) m.preServerSpecialize(args.server); + } } void ZygiskContext::run_modules_post() { @@ -598,11 +608,9 @@ void ZygiskContext::run_modules_post() { size_t modules_unloaded = 0; for (const auto &m : modules) { - if (flags[APP_SPECIALIZE]) { - m.postAppSpecialize(args.app); - } else if (flags[SERVER_FORK_AND_SPECIALIZE]) { - m.postServerSpecialize(args.server); - } + if (flags[APP_SPECIALIZE]) m.postAppSpecialize(args.app); + else if (flags[SERVER_FORK_AND_SPECIALIZE]) m.postServerSpecialize(args.server); + if (m.tryUnload()) modules_unloaded++; } diff --git a/zygiskd/src/zygiskd.c b/zygiskd/src/zygiskd.c index 429c143..44fa9fc 100644 --- a/zygiskd/src/zygiskd.c +++ b/zygiskd/src/zygiskd.c @@ -537,14 +537,28 @@ void zygiskd_start(char *restrict argv[]) { ssize_t ret = write_size_t(client_fd, clen); ASSURE_SIZE_WRITE_BREAK("ReadModules", "len", ret, sizeof(clen)); + enum Architecture arch = get_arch(); + + char arch_str[32]; + switch (arch) { + case ARM64: { strcpy(arch_str, "arm64-v8a"); break; } + case X86_64: { strcpy(arch_str, "x86_64"); break; } + case ARM32: { strcpy(arch_str, "armeabi-v7a"); break; } + case X86: { strcpy(arch_str, "x86"); break; } + } + for (size_t i = 0; i < clen; i++) { - if (write_string(client_fd, context.modules[i].name) == -1) { - LOGE("Failed writing module name.\n"); + char lib_path[PATH_MAX]; + snprintf(lib_path, PATH_MAX, "/data/adb/modules/%s/zygisk/%s.so", context.modules[i].name, arch_str); + + if (write_string(client_fd, lib_path) == -1) { + LOGE("Failed writing module path.\n"); break; } - if (write_fd(client_fd, context.modules[i].lib_fd) == -1) { - LOGE("Failed writing module fd.\n"); + + if (write_string(client_fd, context.modules[i].name) == -1) { + LOGE("Failed writing module name.\n"); break; } From 4625587ea9ff6d5af6c4212e8ad30aa8d67e6eab Mon Sep 17 00:00:00 2001 From: ThePedroo Date: Mon, 31 Mar 2025 19:30:21 -0300 Subject: [PATCH 32/46] improve: ELF utils and SoList code This commit improves the code related to ELF and SoList, porting them to C. --- loader/src/common/elf_util.c | 396 +++++++++++++++++++++++++++++++++ loader/src/common/elf_util.cpp | 263 ---------------------- loader/src/include/elf_util.h | 184 +++++---------- loader/src/include/solist.h | 66 ++++++ loader/src/include/solist.hpp | 211 ------------------ loader/src/injector/hook.cpp | 11 +- loader/src/injector/solist.c | 236 ++++++++++++++++++++ 7 files changed, 759 insertions(+), 608 deletions(-) create mode 100644 loader/src/common/elf_util.c delete mode 100644 loader/src/common/elf_util.cpp create mode 100644 loader/src/include/solist.h delete mode 100644 loader/src/include/solist.hpp create mode 100644 loader/src/injector/solist.c diff --git a/loader/src/common/elf_util.c b/loader/src/common/elf_util.c new file mode 100644 index 0000000..bfe89ba --- /dev/null +++ b/loader/src/common/elf_util.c @@ -0,0 +1,396 @@ +/* INFO: This file is written in C99 */ + +#include +#include +#include +#include +#include +#include +#include + +#include + +#include "logging.h" + +#include "elf_util.h" + +#define SHT_GNU_HASH 0x6ffffff6 + +uint32_t ElfHash(const char *name) { + uint32_t h = 0, g = 0; + + while (*name) { + h = (h << 4) + (unsigned char)*name++; + g = h & 0xf0000000; + + if (g) { + h ^= g >> 24; + } + + h &= ~g; + } + + return h; +} + +uint32_t GnuHash(const char *name) { + uint32_t h = 5381; + + while (*name) { + h = (h << 5) + h + (unsigned char)(*name++); + } + + return h; +} + +ElfW(Shdr) *offsetOf_Shdr(ElfW(Ehdr) * head, ElfW(Off) off) { + return (ElfW(Shdr) *)(((uintptr_t)head) + off); +} + +char *offsetOf_char(ElfW(Ehdr) * head, ElfW(Off) off) { + return (char *)(((uintptr_t)head) + off); +} + +ElfW(Sym) *offsetOf_Sym(ElfW(Ehdr) * head, ElfW(Off) off) { + return (ElfW(Sym) *)(((uintptr_t)head) + off); +} + +ElfW(Word) *offsetOf_Word(ElfW(Ehdr) * head, ElfW(Off) off) { + return (ElfW(Word) *)(((uintptr_t)head) + off); +} + +int dl_cb(struct dl_phdr_info *info, size_t size, void *data) { + (void) size; + + if ((info)->dlpi_name == NULL) return 0; + + ElfImg *img = (ElfImg *)data; + + if (strstr(info->dlpi_name, img->elf)) { + img->elf = strdup(info->dlpi_name); + img->base = (void *)info->dlpi_addr; + + return 1; + } + + return 0; +} + +bool find_module_base(ElfImg *img) { + dl_iterate_phdr(dl_cb, img); + + return img->base != NULL; +} + +size_t calculate_valid_symtabs_amount(ElfImg *img) { + size_t count = 0; + + if (img->symtab_start == NULL || img->symstr_offset_for_symtab == 0) return count; + + for (ElfW(Off) i = 0; i < img->symtab_count; i++) { + unsigned int st_type = ELF_ST_TYPE(img->symtab_start[i].st_info); + + if ((st_type == STT_FUNC || st_type == STT_OBJECT) && img->symtab_start[i].st_size) + count++; + } + + return count; +} + +void ElfImg_destroy(ElfImg *img) { + if (img->elf) { + free(img->elf); + img->elf = NULL; + } + + if (img->symtabs_) { + size_t valid_symtabs_amount = calculate_valid_symtabs_amount(img); + if (valid_symtabs_amount == 0) goto finalize; + + for (size_t i = 0; i < valid_symtabs_amount; i++) { + free(img->symtabs_[i].name); + } + + free(img->symtabs_); + img->symtabs_ = NULL; + } + + if (img->header) { + munmap(img->header, img->size); + img->header = NULL; + } + + finalize: + free(img); + img = NULL; +} + +ElfImg *ElfImg_create(const char *elf) { + ElfImg *img = (ElfImg *)calloc(1, sizeof(ElfImg)); + if (!img) { + LOGE("Failed to allocate memory for ElfImg"); + + return NULL; + } + + img->bias = -4396; + img->elf = strdup(elf); + img->base = NULL; + + if (!find_module_base(img)) { + LOGE("Failed to find module base for %s", img->elf); + + ElfImg_destroy(img); + + return NULL; + } + + int fd = open(img->elf, O_RDONLY); + if (fd < 0) { + LOGE("failed to open %s", img->elf); + + ElfImg_destroy(img); + + return NULL; + } + + img->size = lseek(fd, 0, SEEK_END); + if (img->size <= 0) { + LOGE("lseek() failed for %s", img->elf); + + ElfImg_destroy(img); + + return NULL; + } + + img->header = (ElfW(Ehdr) *)mmap(NULL, img->size, PROT_READ, MAP_SHARED, fd, 0); + + close(fd); + + img->section_header = offsetOf_Shdr(img->header, img->header->e_shoff); + + uintptr_t shoff = (uintptr_t)img->section_header; + char *section_str = offsetOf_char(img->header, img->section_header[img->header->e_shstrndx].sh_offset); + + for (int i = 0; i < img->header->e_shnum; i++, shoff += img->header->e_shentsize) { + ElfW(Shdr) *section_h = (ElfW(Shdr *))shoff; + + char *sname = section_h->sh_name + section_str; + size_t entsize = section_h->sh_entsize; + + switch (section_h->sh_type) { + case SHT_DYNSYM: { + if (img->bias == -4396) { + img->dynsym = section_h; + img->dynsym_offset = section_h->sh_offset; + img->dynsym_start = offsetOf_Sym(img->header, img->dynsym_offset); + } + + break; + } + case SHT_SYMTAB: { + if (strcmp(sname, ".symtab") == 0) { + img->symtab = section_h; + img->symtab_offset = section_h->sh_offset; + img->symtab_size = section_h->sh_size; + img->symtab_count = img->symtab_size / entsize; + img->symtab_start = offsetOf_Sym(img->header, img->symtab_offset); + } + + break; + } + case SHT_STRTAB: { + if (img->bias == -4396) { + img->strtab = section_h; + img->symstr_offset = section_h->sh_offset; + img->strtab_start = offsetOf_Sym(img->header, img->symstr_offset); + } + + if (strcmp(sname, ".strtab") == 0) { + img->symstr_offset_for_symtab = section_h->sh_offset; + } + + break; + } + case SHT_PROGBITS: { + if (img->strtab == NULL || img->dynsym == NULL) + break; + + if (img->bias == -4396) { + img->bias = (off_t)section_h->sh_addr - (off_t)section_h->sh_offset; + } + + break; + } + case SHT_HASH: { + ElfW(Word) *d_un = offsetOf_Word(img->header, section_h->sh_offset); + img->nbucket_ = d_un[0]; + img->bucket_ = d_un + 2; + img->chain_ = img->bucket_ + img->nbucket_; + + break; + } + case SHT_GNU_HASH: { + ElfW(Word) *d_buf = (ElfW(Word) *)(((size_t)img->header) + section_h->sh_offset); + img->gnu_nbucket_ = d_buf[0]; + img->gnu_symndx_ = d_buf[1]; + img->gnu_bloom_size_ = d_buf[2]; + img->gnu_shift2_ = d_buf[3]; + img->gnu_bloom_filter_ = (uintptr_t *)(d_buf + 4); + img->gnu_bucket_ = (uint32_t *)(img->gnu_bloom_filter_ + img->gnu_bloom_size_); + img->gnu_chain_ = img->gnu_bucket_ + img->gnu_nbucket_ - img->gnu_symndx_; + + break; + } + } + } + + return img; +} + +ElfW(Addr) ElfLookup(ElfImg *restrict img, const char *restrict name, uint32_t hash) { + if (img->nbucket_ == 0) + return 0; + + char *strings = (char *)img->strtab_start; + + for (size_t n = img->bucket_[hash % img->nbucket_]; n != 0; n = img->chain_[n]) { + ElfW(Sym) *sym = img->dynsym_start + n; + + if (strncmp(name, strings + sym->st_name, strlen(name)) == 0) + return sym->st_value; + } + return 0; +} + +ElfW(Addr) GnuLookup(ElfImg *restrict img, const char *name, uint32_t hash) { + static size_t bloom_mask_bits = sizeof(ElfW(Addr)) * 8; + + if (img->gnu_nbucket_ == 0 || img->gnu_bloom_size_ == 0) + return 0; + + size_t bloom_word = + img->gnu_bloom_filter_[(hash / bloom_mask_bits) % img->gnu_bloom_size_]; + uintptr_t mask = 0 | (uintptr_t)1 << (hash % bloom_mask_bits) | + (uintptr_t)1 << ((hash >> img->gnu_shift2_) % bloom_mask_bits); + if ((mask & bloom_word) == mask) { + size_t sym_index = img->gnu_bucket_[hash % img->gnu_nbucket_]; + if (sym_index >= img->gnu_symndx_) { + char *strings = (char *)img->strtab_start; + do { + ElfW(Sym) *sym = img->dynsym_start + sym_index; + + if (((img->gnu_chain_[sym_index] ^ hash) >> 1) == 0 && + name == strings + sym->st_name) { + return sym->st_value; + } + } while ((img->gnu_chain_[sym_index++] & 1) == 0); + } + } + + return 0; +} + +ElfW(Addr) LinearLookup(ElfImg *img, const char *restrict name) { + size_t valid_symtabs_amount = calculate_valid_symtabs_amount(img); + if (valid_symtabs_amount == 0) return 0; + + if (!img->symtabs_) { + img->symtabs_ = (struct symtabs *)calloc(1, sizeof(struct symtabs) * valid_symtabs_amount); + if (!img->symtabs_) return 0; + + + if (img->symtab_start != NULL && img->symstr_offset_for_symtab != 0) { + ElfW(Off) i = 0; + for (ElfW(Off) pos = 0; pos < img->symtab_count; pos++) { + unsigned int st_type = ELF_ST_TYPE(img->symtab_start[pos].st_info); + const char *st_name = offsetOf_char(img->header, img->symstr_offset_for_symtab + img->symtab_start[pos].st_name); + + if ((st_type == STT_FUNC || st_type == STT_OBJECT) && img->symtab_start[pos].st_size) { + img->symtabs_[i].name = strdup(st_name); + img->symtabs_[i].sym = &img->symtab_start[pos]; + + i++; + } + } + } + } + + for (size_t i = 0; i < valid_symtabs_amount; i++) { + if (strcmp(name, img->symtabs_[i].name) != 0) continue; + + return img->symtabs_[i].sym->st_value; + } + + return 0; +} + +ElfW(Addr) LinearLookupByPrefix(ElfImg *img, const char *name) { + size_t valid_symtabs_amount = calculate_valid_symtabs_amount(img); + if (valid_symtabs_amount == 0) return 0; + + if (!img->symtabs_) { + img->symtabs_ = (struct symtabs *)malloc(sizeof(struct symtabs) * valid_symtabs_amount); + if (!img->symtabs_) return 0; + + if (img->symtab_start != NULL && img->symstr_offset_for_symtab != 0) { + ElfW(Off) i = 0; + for (ElfW(Off) pos = 0; pos < img->symtab_count; pos++) { + unsigned int st_type = ELF_ST_TYPE(img->symtab_start[pos].st_info); + const char *st_name = offsetOf_char(img->header, img->symstr_offset_for_symtab + img->symtab_start[pos].st_name); + + if ((st_type == STT_FUNC || st_type == STT_OBJECT) && img->symtab_start[pos].st_size) { + img->symtabs_[i].name = strdup(st_name); + img->symtabs_[i].sym = &img->symtab_start[pos]; + + i++; + } + } + } + } + + for (size_t i = 0; i < valid_symtabs_amount; i++) { + if (strlen(img->symtabs_[i].name) < strlen(name)) + continue; + + if (strncmp(img->symtabs_[i].name, name, strlen(name)) == 0) + return img->symtabs_[i].sym->st_value; + } + + return 0; +} + +ElfW(Addr) getSymbOffset(ElfImg *img, const char *name) { + ElfW(Addr) offset = GnuLookup(img, name, GnuHash(name)); + if (offset > 0) return offset; + + offset = ElfLookup(img, name, ElfHash(name)); + if (offset > 0) return offset; + + offset = LinearLookup(img, name); + if (offset > 0) return offset; + + return 0; +} + +ElfW(Addr) getSymbAddress(ElfImg *img, const char *name) { + ElfW(Addr) offset = getSymbOffset(img, name); + + if (offset < 0 || !img->base) return 0; + + return ((uintptr_t)img->base + offset - img->bias); +} + +ElfW(Addr) getSymbAddressByPrefix(ElfImg *img, const char *prefix) { + ElfW(Addr) offset = LinearLookupByPrefix(img, prefix); + + if (offset < 0 || !img->base) return 0; + + return (ElfW(Addr))((uintptr_t)img->base + offset - img->bias); +} + +void *getSymbValueByPrefix(ElfImg *img, const char *prefix) { + ElfW(Addr) address = getSymbAddressByPrefix(img, prefix); + + return address == 0 ? NULL : *((void **)address); +} diff --git a/loader/src/common/elf_util.cpp b/loader/src/common/elf_util.cpp deleted file mode 100644 index 2ce61b8..0000000 --- a/loader/src/common/elf_util.cpp +++ /dev/null @@ -1,263 +0,0 @@ -/* - * This file is part of LSPosed. - * - * LSPosed is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * LSPosed is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with LSPosed. If not, see . - * - * Copyright (C) 2019 Swift Gan - * Copyright (C) 2021 LSPosed Contributors - */ -#include -#include -#include -#include -#include -#include -#include -#include "elf_util.h" - -using namespace SandHook; - -template -inline constexpr auto offsetOf(ElfW(Ehdr) *head, ElfW(Off) off) { - return reinterpret_cast, T, T *>>( - reinterpret_cast(head) + off); -} - -ElfImg::ElfImg(std::string_view base_name) : elf(base_name) { - if (!findModuleBase()) { - base = nullptr; - return; - } - - //load elf - int fd = open(elf.data(), O_RDONLY); - if (fd < 0) { - // LOGE("failed to open %s", elf.data()); - return; - } - - size = lseek(fd, 0, SEEK_END); - if (size <= 0) { - // LOGE("lseek() failed for %s", elf.data()); - } - - header = reinterpret_cast(mmap(nullptr, size, PROT_READ, MAP_SHARED, fd, 0)); - - close(fd); - - section_header = offsetOf(header, header->e_shoff); - - auto shoff = reinterpret_cast(section_header); - char *section_str = offsetOf(header, section_header[header->e_shstrndx].sh_offset); - - for (int i = 0; i < header->e_shnum; i++, shoff += header->e_shentsize) { - auto *section_h = (ElfW(Shdr) *) shoff; - char *sname = section_h->sh_name + section_str; - auto entsize = section_h->sh_entsize; - switch (section_h->sh_type) { - case SHT_DYNSYM: { - if (bias == -4396) { - dynsym = section_h; - dynsym_offset = section_h->sh_offset; - dynsym_start = offsetOf(header, dynsym_offset); - } - break; - } - case SHT_SYMTAB: { - if (strcmp(sname, ".symtab") == 0) { - symtab = section_h; - symtab_offset = section_h->sh_offset; - symtab_size = section_h->sh_size; - symtab_count = symtab_size / entsize; - symtab_start = offsetOf(header, symtab_offset); - } - break; - } - case SHT_STRTAB: { - if (bias == -4396) { - strtab = section_h; - symstr_offset = section_h->sh_offset; - strtab_start = offsetOf(header, symstr_offset); - } - if (strcmp(sname, ".strtab") == 0) { - symstr_offset_for_symtab = section_h->sh_offset; - } - break; - } - case SHT_PROGBITS: { - if (strtab == nullptr || dynsym == nullptr) break; - if (bias == -4396) { - bias = (off_t) section_h->sh_addr - (off_t) section_h->sh_offset; - } - break; - } - case SHT_HASH: { - auto *d_un = offsetOf(header, section_h->sh_offset); - nbucket_ = d_un[0]; - bucket_ = d_un + 2; - chain_ = bucket_ + nbucket_; - break; - } - case SHT_GNU_HASH: { - auto *d_buf = reinterpret_cast(((size_t) header) + - section_h->sh_offset); - gnu_nbucket_ = d_buf[0]; - gnu_symndx_ = d_buf[1]; - gnu_bloom_size_ = d_buf[2]; - gnu_shift2_ = d_buf[3]; - gnu_bloom_filter_ = reinterpret_cast(d_buf + 4); - gnu_bucket_ = reinterpret_cast(gnu_bloom_filter_ + - gnu_bloom_size_); - gnu_chain_ = gnu_bucket_ + gnu_nbucket_ - gnu_symndx_; - break; - } - } - } -} - -ElfW(Addr) ElfImg::ElfLookup(std::string_view name, uint32_t hash) const { - if (nbucket_ == 0) return 0; - - char *strings = (char *) strtab_start; - - for (auto n = bucket_[hash % nbucket_]; n != 0; n = chain_[n]) { - auto *sym = dynsym_start + n; - if (name == strings + sym->st_name) { - return sym->st_value; - } - } - return 0; -} - -ElfW(Addr) ElfImg::GnuLookup(std::string_view name, uint32_t hash) const { - static constexpr auto bloom_mask_bits = sizeof(ElfW(Addr)) * 8; - - if (gnu_nbucket_ == 0 || gnu_bloom_size_ == 0) return 0; - - auto bloom_word = gnu_bloom_filter_[(hash / bloom_mask_bits) % gnu_bloom_size_]; - uintptr_t mask = 0 - | (uintptr_t) 1 << (hash % bloom_mask_bits) - | (uintptr_t) 1 << ((hash >> gnu_shift2_) % bloom_mask_bits); - if ((mask & bloom_word) == mask) { - auto sym_index = gnu_bucket_[hash % gnu_nbucket_]; - if (sym_index >= gnu_symndx_) { - char *strings = (char *) strtab_start; - do { - auto *sym = dynsym_start + sym_index; - if (((gnu_chain_[sym_index] ^ hash) >> 1) == 0 - && name == strings + sym->st_name) { - return sym->st_value; - } - } while ((gnu_chain_[sym_index++] & 1) == 0); - } - } - return 0; -} - -ElfW(Addr) ElfImg::LinearLookup(std::string_view name) const { - if (symtabs_.empty()) { - symtabs_.reserve(symtab_count); - if (symtab_start != nullptr && symstr_offset_for_symtab != 0) { - for (ElfW(Off) i = 0; i < symtab_count; i++) { - unsigned int st_type = ELF_ST_TYPE(symtab_start[i].st_info); - const char *st_name = offsetOf(header, symstr_offset_for_symtab + - symtab_start[i].st_name); - if ((st_type == STT_FUNC || st_type == STT_OBJECT) && symtab_start[i].st_size) { - symtabs_.emplace(st_name, &symtab_start[i]); - } - } - } - } - - if (auto i = symtabs_.find(name); i != symtabs_.end()) { - return i->second->st_value; - } else { - return 0; - } -} - -ElfW(Addr) ElfImg::LinearLookupByPrefix(std::string_view name) const { - if (symtabs_.empty()) { - symtabs_.reserve(symtab_count); - if (symtab_start != nullptr && symstr_offset_for_symtab != 0) { - for (ElfW(Off) i = 0; i < symtab_count; i++) { - unsigned int st_type = ELF_ST_TYPE(symtab_start[i].st_info); - const char *st_name = offsetOf(header, symstr_offset_for_symtab + - symtab_start[i].st_name); - if ((st_type == STT_FUNC || st_type == STT_OBJECT) && symtab_start[i].st_size) { - symtabs_.emplace(st_name, &symtab_start[i]); - } - } - } - } - - auto size = name.size(); - for (auto symtab : symtabs_) { - if (symtab.first.size() < size) continue; - - if (symtab.first.substr(0, size) == name) { - return symtab.second->st_value; - } - } - - return 0; -} - - -ElfImg::~ElfImg() { - //open elf file local - if (buffer) { - free(buffer); - buffer = nullptr; - } - //use mmap - if (header) { - munmap(header, size); - } -} - -ElfW(Addr) ElfImg::getSymbOffset(std::string_view name, uint32_t gnu_hash, uint32_t elf_hash) const { - if (auto offset = GnuLookup(name, gnu_hash); offset > 0) { - // LOGD("found %s %p in %s in dynsym by gnuhash", name.data(), reinterpret_cast(offset), elf.data()); - return offset; - } else if (offset = ElfLookup(name, elf_hash); offset > 0) { - // LOGD("found %s %p in %s in dynsym by elfhash", name.data(), reinterpret_cast(offset), elf.data()); - return offset; - } else if (offset = LinearLookup(name); offset > 0) { - // LOGD("found %s %p in %s in symtab by linear lookup", name.data(), reinterpret_cast(offset), elf.data()); - return offset; - } else { - return 0; - } - -} - -bool ElfImg::findModuleBase() { - dl_iterate_phdr([](struct dl_phdr_info *info, size_t size, void *data) -> int { - (void) size; - - if ((info)->dlpi_name == nullptr) { - return 0; - } - - auto *self = reinterpret_cast(data); - if (strstr(info->dlpi_name, self->elf.data())) { - self->elf = info->dlpi_name; - self->base = reinterpret_cast(info->dlpi_addr); - return 1; - } - return 0; - }, this); - return base != 0; -} diff --git a/loader/src/include/elf_util.h b/loader/src/include/elf_util.h index 42a08c6..fd24ecd 100644 --- a/loader/src/include/elf_util.h +++ b/loader/src/include/elf_util.h @@ -1,152 +1,76 @@ -/* - * This file is part of LSPosed. - * - * LSPosed is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * LSPosed is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with LSPosed. If not, see . - * - * Copyright (C) 2019 Swift Gan - * Copyright (C) 2021 LSPosed Contributors - */ -#ifndef SANDHOOK_ELF_UTIL_H -#define SANDHOOK_ELF_UTIL_H +#ifndef ELF_UTIL_H +#define ELF_UTIL_H -#include -#include +#include +#include #include #include -#include -#include + +#define restrict /* INFO: Temporary measure */ #define SHT_GNU_HASH 0x6ffffff6 -namespace SandHook { - class ElfImg { - public: +struct symtabs { + char *name; + ElfW(Sym) *sym; +}; - ElfImg(std::string_view elf); +typedef struct { + char *elf; + void *base; + char *buffer; + off_t size; + off_t bias; + ElfW(Ehdr) *header; + ElfW(Shdr) *section_header; + ElfW(Shdr) *symtab; + ElfW(Shdr) *strtab; + ElfW(Shdr) *dynsym; + ElfW(Sym) *symtab_start; + ElfW(Sym) *dynsym_start; + ElfW(Sym) *strtab_start; + ElfW(Off) symtab_count; + ElfW(Off) symstr_offset; + ElfW(Off) symstr_offset_for_symtab; + ElfW(Off) symtab_offset; + ElfW(Off) dynsym_offset; + ElfW(Off) symtab_size; - constexpr ElfW(Addr) getSymbOffset(std::string_view name) const { - return getSymbOffset(name, GnuHash(name), ElfHash(name)); - } + uint32_t nbucket_; + uint32_t *bucket_; + uint32_t *chain_; - constexpr ElfW(Addr) getSymbAddress(std::string_view name) const { - ElfW(Addr) offset = getSymbOffset(name); - if (offset > 0 && base != nullptr) { - return static_cast((uintptr_t) base + offset - bias); - } else { - return 0; - } - } + uint32_t gnu_nbucket_; + uint32_t gnu_symndx_; + uint32_t gnu_bloom_size_; + uint32_t gnu_shift2_; + uintptr_t *gnu_bloom_filter_; + uint32_t *gnu_bucket_; + uint32_t *gnu_chain_; - constexpr ElfW(Addr) getSymbAddressByPrefix(std::string_view prefix) const { - ElfW(Addr) offset = LinearLookupByPrefix(prefix); - if (offset > 0 && base != nullptr) { - return static_cast((uintptr_t) base + offset - bias); - } else { - return 0; - } - } + struct symtabs *symtabs_; +} ElfImg; - template - constexpr T getSymbAddress(std::string_view name) const { - return reinterpret_cast(getSymbAddress(name)); - } +void ElfImg_destroy(ElfImg *img); - template - constexpr T getSymbAddressByPrefix(std::string_view prefix) const { - return reinterpret_cast(getSymbAddressByPrefix(prefix)); - } +ElfImg *ElfImg_create(const char *elf); - bool isValid() const { - return base != nullptr; - } +ElfW(Addr) ElfLookup(ElfImg *restrict img, const char *restrict name, uint32_t hash); - const std::string name() const { - return elf; - } +ElfW(Addr) GnuLookup(ElfImg *restrict img, const char *restrict name, uint32_t hash); - ~ElfImg(); +ElfW(Addr) LinearLookup(ElfImg *restrict img, const char *restrict name); - private: - ElfW(Addr) getSymbOffset(std::string_view name, uint32_t gnu_hash, uint32_t elf_hash) const; +ElfW(Addr) LinearLookupByPrefix(ElfImg *restrict img, const char *name); - ElfW(Addr) ElfLookup(std::string_view name, uint32_t hash) const; +int dl_cb(struct dl_phdr_info *info, size_t size, void *data); - ElfW(Addr) GnuLookup(std::string_view name, uint32_t hash) const; +ElfW(Addr) getSymbOffset(ElfImg *img, const char *name); - ElfW(Addr) LinearLookup(std::string_view name) const; +ElfW(Addr) getSymbAddress(ElfImg *img, const char *name); - ElfW(Addr) LinearLookupByPrefix(std::string_view name) const; +ElfW(Addr) getSymbAddressByPrefix(ElfImg *img, const char *prefix); - constexpr static uint32_t ElfHash(std::string_view name); +void *getSymbValueByPrefix(ElfImg *img, const char *prefix); - constexpr static uint32_t GnuHash(std::string_view name); - - bool findModuleBase(); - - std::string elf; - void *base = nullptr; - char *buffer = nullptr; - off_t size = 0; - off_t bias = -4396; - ElfW(Ehdr) *header = nullptr; - ElfW(Shdr) *section_header = nullptr; - ElfW(Shdr) *symtab = nullptr; - ElfW(Shdr) *strtab = nullptr; - ElfW(Shdr) *dynsym = nullptr; - ElfW(Sym) *symtab_start = nullptr; - ElfW(Sym) *dynsym_start = nullptr; - ElfW(Sym) *strtab_start = nullptr; - ElfW(Off) symtab_count = 0; - ElfW(Off) symstr_offset = 0; - ElfW(Off) symstr_offset_for_symtab = 0; - ElfW(Off) symtab_offset = 0; - ElfW(Off) dynsym_offset = 0; - ElfW(Off) symtab_size = 0; - - uint32_t nbucket_{}; - uint32_t *bucket_ = nullptr; - uint32_t *chain_ = nullptr; - - uint32_t gnu_nbucket_{}; - uint32_t gnu_symndx_{}; - uint32_t gnu_bloom_size_; - uint32_t gnu_shift2_; - uintptr_t *gnu_bloom_filter_; - uint32_t *gnu_bucket_; - uint32_t *gnu_chain_; - - mutable std::unordered_map symtabs_; - }; - - constexpr uint32_t ElfImg::ElfHash(std::string_view name) { - uint32_t h = 0, g = 0; - for (unsigned char p: name) { - h = (h << 4) + p; - g = h & 0xf0000000; - h ^= g; - h ^= g >> 24; - } - return h; - } - - constexpr uint32_t ElfImg::GnuHash(std::string_view name) { - uint32_t h = 5381; - for (unsigned char p: name) { - h += (h << 5) + p; - } - return h; - } -} - -#endif //SANDHOOK_ELF_UTIL_H \ No newline at end of file +#endif /* ELF_UTIL_H */ diff --git a/loader/src/include/solist.h b/loader/src/include/solist.h new file mode 100644 index 0000000..906b56f --- /dev/null +++ b/loader/src/include/solist.h @@ -0,0 +1,66 @@ +#ifndef SOLIST_H +#define SOLIST_H + +/* INFO: Temporary */ +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +typedef struct SoInfo SoInfo; + +struct SoInfo { + char data[0]; +}; + +#define FuncType(name) void (*name) + +struct pdg { + void *(*ctor)(); + void *(*dtor)(); +}; + +/* + INFO: When dlopen'ing a library, the system will save information of the + opened library so a structure called soinfo, which contains another + called solist, a list with the information of opened objects. + + Due to special handling in ptracer, however, it won't heave gaps in the + memory of the list since we will close there, not loading a library creating + this gap. However, the previously loaded library would remain in the solist, + requiring ReZygisk to clean those up. + + To do that, we use 2 functions: soinfo_free, and set_size, which will + zero the region size, and then remove all traces of that library (libzygisk.so) + which was previously loaded. + + SOURCES: + - https://android.googlesource.com/platform/bionic/+/refs/heads/android15-release/linker/linker.cpp#1712 +*/ +bool solist_drop_so_path(const char *target_path); + +/* + INFO: When dlopen'ing a library, the system will increment 1 to a global + counter that tracks the amount of libraries ever loaded in that process, + the same happening in dlclose. + + This cannot directly be used to detect if ReZygisk is present, however, with + enough data about specific environments, this can be used to detect if any + other library (be it malicious or not) was loaded. To avoid future detections, + we patch that value to the original value. + + To do that, we retrieve the address of both "g_module_load_counter" and "g_module + _unload_counter" variables and force set them to the original value, based on + the modules dlopen'ed. + + SOURCES: + - https://android.googlesource.com/platform/bionic/+/refs/heads/android15-release/linker/linker.cpp#1874 + - https://android.googlesource.com/platform/bionic/+/refs/heads/android15-release/linker/linker.cpp#1944 + - https://android.googlesource.com/platform/bionic/+/refs/heads/android15-release/linker/linker.cpp#3413 +*/ +void solist_reset_counters(size_t load, size_t unload); + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* SOLIST_H */ diff --git a/loader/src/include/solist.hpp b/loader/src/include/solist.hpp deleted file mode 100644 index 6835517..0000000 --- a/loader/src/include/solist.hpp +++ /dev/null @@ -1,211 +0,0 @@ -// -// Original from https://github.com/LSPosed/NativeDetector/blob/master/app/src/main/jni/solist.cpp -// -#pragma once - -#include -#include "elf_util.h" -#include "logging.h" - -namespace SoList { - class SoInfo { - public: - #ifdef __LP64__ - inline static size_t solist_size_offset = 0x18; - inline static size_t solist_next_offset = 0x28; - constexpr static size_t solist_realpath_offset = 0x1a8; - #else - inline static size_t solist_size_offset = 0x90; - inline static size_t solist_next_offset = 0xa4; - constexpr static size_t solist_realpath_offset = 0x174; - #endif - - inline static const char *(*get_realpath_sym)(SoInfo *) = NULL; - inline static void (*soinfo_free)(SoInfo *) = NULL; - - inline SoInfo *get_next() { - return *(SoInfo **) ((uintptr_t) this + solist_next_offset); - } - - inline size_t get_size() { - return *(size_t *) ((uintptr_t) this + solist_size_offset); - } - - inline const char *get_path() { - if (get_realpath_sym) return get_realpath_sym(this); - - return ((std::string *) ((uintptr_t) this + solist_realpath_offset))->c_str(); - } - - void set_next(SoInfo *si) { - *(SoInfo **) ((uintptr_t) this + solist_next_offset) = si; - } - - void set_size(size_t size) { - *(size_t *) ((uintptr_t) this + solist_size_offset) = size; - } - }; - - class ProtectedDataGuard { - public: - ProtectedDataGuard() { - if (ctor != nullptr) - (this->*ctor)(); - } - - ~ProtectedDataGuard() { - if (dtor != nullptr) - (this->*dtor)(); - } - - static bool setup(const SandHook::ElfImg &linker) { - ctor = MemFunc{.data = {.p = reinterpret_cast(linker.getSymbAddress( - "__dl__ZN18ProtectedDataGuardC2Ev")), .adj = 0}}.f; - dtor = MemFunc{.data = {.p = reinterpret_cast(linker.getSymbAddress( - "__dl__ZN18ProtectedDataGuardD2Ev")), .adj = 0}}.f; - return ctor != nullptr && dtor != nullptr; - } - - ProtectedDataGuard(const ProtectedDataGuard &) = delete; - - void operator=(const ProtectedDataGuard &) = delete; - - private: - using FuncType = void (ProtectedDataGuard::*)(); - - inline static FuncType ctor = NULL; - inline static FuncType dtor = NULL; - - union MemFunc { - FuncType f; - - struct { - void *p; - std::ptrdiff_t adj; - } data; - }; - }; - - - static SoInfo *solist = NULL; - static SoInfo *somain = NULL; - static SoInfo **sonext = NULL; - - static uint64_t *g_module_load_counter = NULL; - static uint64_t *g_module_unload_counter = NULL; - - static bool Initialize(); - - template - inline T *getStaticPointer(const SandHook::ElfImg &linker, const char *name) { - auto *addr = reinterpret_cast(linker.getSymbAddress(name)); - - return addr == NULL ? NULL : *addr; - } - - template - inline T *getStaticPointerByPrefix(const SandHook::ElfImg &linker, const char *name) { - auto *addr = reinterpret_cast(linker.getSymbAddressByPrefix(name)); - - return addr == NULL ? NULL : *addr; - } - - static bool DropSoPath(const char* target_path) { - bool path_found = false; - if (solist == NULL && !Initialize()) { - LOGE("Failed to initialize solist"); - return path_found; - } - for (auto iter = solist; iter; iter = iter->get_next()) { - if (iter->get_path() && strstr(iter->get_path(), target_path)) { - SoList::ProtectedDataGuard guard; - LOGV("dropping solist record loaded at %s with size %zu", iter->get_path(), iter->get_size()); - if (iter->get_size() > 0) { - iter->set_size(0); - SoInfo::soinfo_free(iter); - path_found = true; - } - } - } - return path_found; - } - - static void ResetCounters(size_t load, size_t unload) { - if (solist == NULL && !Initialize()) { - LOGE("Failed to initialize solist"); - return; - } - if (g_module_load_counter == NULL || g_module_unload_counter == NULL) { - LOGD("g_module counters not defined, skip reseting them"); - return; - } - auto loaded_modules = *g_module_load_counter; - auto unloaded_modules = *g_module_unload_counter; - if (loaded_modules >= load) { - *g_module_load_counter = loaded_modules - load; - LOGD("reset g_module_load_counter to %zu", (size_t) *g_module_load_counter); - } - if (unloaded_modules >= unload) { - *g_module_unload_counter = unloaded_modules - unload; - LOGD("reset g_module_unload_counter to %zu", (size_t) *g_module_unload_counter); - } - } - - static bool Initialize() { - SandHook::ElfImg linker("/linker"); - if (!ProtectedDataGuard::setup(linker)) return false; - LOGD("found symbol ProtectedDataGuard"); - - /* INFO: Since Android 15, the symbol names for the linker have a suffix, - this makes it impossible to hardcode the symbol names. To allow - this to work on all versions, we need to iterate over the loaded - symbols and find the correct ones. - - See #63 for more information. - */ - solist = getStaticPointerByPrefix(linker, "__dl__ZL6solist"); - if (solist == NULL) return false; - LOGD("found symbol solist"); - - somain = getStaticPointerByPrefix(linker, "__dl__ZL6somain"); - if (somain == NULL) return false; - LOGD("found symbol somain"); - - sonext = linker.getSymbAddressByPrefix("__dl__ZL6sonext"); - if (sonext == NULL) return false; - LOGD("found symbol sonext"); - - SoInfo *vdso = getStaticPointerByPrefix(linker, "__dl__ZL4vdso"); - if (vdso != NULL) LOGD("found symbol vdso"); - - SoInfo::get_realpath_sym = reinterpret_cast(linker.getSymbAddress("__dl__ZNK6soinfo12get_realpathEv")); - if (SoInfo::get_realpath_sym == NULL) return false; - LOGD("found symbol get_realpath_sym"); - - SoInfo::soinfo_free = reinterpret_cast(linker.getSymbAddressByPrefix("__dl__ZL11soinfo_freeP6soinfo")); - if (SoInfo::soinfo_free == NULL) return false; - LOGD("found symbol soinfo_free"); - - g_module_load_counter = reinterpret_cast(linker.getSymbAddress("__dl__ZL21g_module_load_counter")); - if (g_module_load_counter != NULL) LOGD("found symbol g_module_load_counter"); - - g_module_unload_counter = reinterpret_cast(linker.getSymbAddress("__dl__ZL23g_module_unload_counter")); - if (g_module_unload_counter != NULL) LOGD("found symbol g_module_unload_counter"); - - for (size_t i = 0; i < 1024 / sizeof(void *); i++) { - auto possible_field = (uintptr_t) solist + i * sizeof(void *); - auto possible_size_of_somain = *(size_t *)((uintptr_t) somain + i * sizeof(void *)); - if (possible_size_of_somain < 0x100000 && possible_size_of_somain > 0x100) { - SoInfo::solist_size_offset = i * sizeof(void *); - LOGD("solist_size_offset is %zu * %zu = %p", i, sizeof(void *), (void*) SoInfo::solist_size_offset); - } - if (*(void **)possible_field == somain || (vdso != NULL && *(void **)possible_field == vdso)) { - SoInfo::solist_next_offset = i * sizeof(void *); - LOGD("solist_next_offset is %zu * %zu = %p", i, sizeof(void *), (void*) SoInfo::solist_next_offset); - break; - } - } - - return true; - } -} diff --git a/loader/src/injector/hook.cpp b/loader/src/injector/hook.cpp index c3282c1..c3abc4c 100644 --- a/loader/src/injector/hook.cpp +++ b/loader/src/injector/hook.cpp @@ -21,7 +21,7 @@ #include "files.hpp" #include "misc.hpp" -#include "solist.hpp" +#include "solist.h" #include "art_method.hpp" @@ -616,7 +616,7 @@ void ZygiskContext::run_modules_post() { if (modules.size() > 0) { LOGD("modules unloaded: %zu/%zu", modules_unloaded, modules.size()); - clean_trace("/data/adb", modules.size(), modules_unloaded, true); + clean_trace("/data/adb/rezygisk", modules.size(), modules_unloaded, true); } } @@ -778,8 +778,11 @@ static void hook_register(dev_t dev, ino_t inode, const char *symbol, void *new_ void clean_trace(const char* path, size_t load, size_t unload, bool spoof_maps) { LOGD("cleaning trace for path %s", path); - if (load > 0 || unload >0) SoList::ResetCounters(load, unload); - bool path_found = SoList::DropSoPath(path); + if (load > 0 || unload > 0) solist_reset_counters(load, unload); + + LOGI("Dropping solist record for %s", path); + + bool path_found = solist_drop_so_path(path); if (!path_found || !spoof_maps) return; LOGD("spoofing virtual maps for %s", path); diff --git a/loader/src/injector/solist.c b/loader/src/injector/solist.c new file mode 100644 index 0000000..b338938 --- /dev/null +++ b/loader/src/injector/solist.c @@ -0,0 +1,236 @@ +/* INFO: This file is written in C99 */ + +#include +#include +#include + +#include "elf_util.h" +#include "logging.h" + +#include "solist.h" + +#ifdef __LP64__ + size_t solist_size_offset = 0x18; + size_t solist_next_offset = 0x30; + size_t solist_realpath_offset = 0x1a8; +#else + size_t solist_size_offset = 0x90; + size_t solist_next_offset = 0xa4; + size_t solist_realpath_offset = 0x174; +#endif + +static const char *(*get_realpath_sym)(SoInfo *) = NULL; +static void (*soinfo_free)(SoInfo *) = NULL; + +static inline SoInfo *get_next(SoInfo *self) { + return *(SoInfo **)((uintptr_t)self + solist_next_offset); +} + +static inline const char *get_path(SoInfo *self) { + if (get_realpath_sym) + return (*get_realpath_sym)(self); + + return ((const char *)((uintptr_t)self + solist_realpath_offset)); +} + +static inline void set_size(SoInfo *self, size_t size) { + *(size_t *) ((uintptr_t)self + solist_size_offset) = size; +} + +static inline size_t get_size(SoInfo *self) { + return *(size_t *) ((uintptr_t)self + solist_size_offset); +} + +struct pdg ppdg; + +static bool pdg_setup(ElfImg *img) { + ppdg.ctor = (void *(*)())getSymbAddress(img, "__dl__ZN18ProtectedDataGuardC2Ev"); + ppdg.dtor = (void *(*)())getSymbAddress(img, "__dl__ZN18ProtectedDataGuardD2Ev"); + + return ppdg.ctor != NULL && ppdg.dtor != NULL; +} + +static void pdg_protect() { + if (ppdg.ctor != NULL) + (*(ppdg.ctor))(); +} + +static void pdg_unprotect() { + if (ppdg.dtor != NULL) + (*(ppdg.dtor))(); +} + +static SoInfo *solist = NULL; +static SoInfo *somain = NULL; +static SoInfo **sonext = NULL; + +static uint64_t *g_module_load_counter = NULL; +static uint64_t *g_module_unload_counter = NULL; + +static bool solist_init() { + ElfImg *linker = ElfImg_create("/linker"); + if (linker == NULL) { + LOGE("Failed to load linker"); + + return false; + } + + ppdg = (struct pdg) { + .ctor = NULL, + .dtor = NULL + }; + if (!pdg_setup(linker)) { + LOGE("Failed to setup pdg"); + + ElfImg_destroy(linker); + + return false; + } + + /* INFO: Since Android 15, the symbol names for the linker have a suffix, + this makes it impossible to hardcode the symbol names. To allow + this to work on all versions, we need to iterate over the loaded + symbols and find the correct ones. + + See #63 for more information. + */ + solist = (SoInfo *)getSymbValueByPrefix(linker, "__dl__ZL6solist"); + if (solist == NULL) { + LOGE("Failed to find solist __dl__ZL6solist*"); + + ElfImg_destroy(linker); + + return false; + } + + somain = (SoInfo *)getSymbValueByPrefix(linker, "__dl__ZL6somain"); + LOGI("%p is somain", (void *)somain); + if (somain == NULL) { + LOGE("Failed to find somain __dl__ZL6somain*"); + + ElfImg_destroy(linker); + + return false; + } + + sonext = (SoInfo **)getSymbAddressByPrefix(linker, "__dl__ZL6sonext"); + if (sonext == NULL) { + LOGE("Failed to find sonext __dl__ZL6sonext*"); + + ElfImg_destroy(linker); + + return false; + } + + SoInfo *vdso = (SoInfo *)getSymbValueByPrefix(linker, "__dl__ZL4vdso"); + if (vdso == NULL) { + LOGE("Failed to find vsdo __dl__ZL4vdso*"); + + ElfImg_destroy(linker); + + return false; + } + + get_realpath_sym = (const char *(*)(SoInfo *))getSymbAddress(linker, "__dl__ZNK6soinfo12get_realpathEv"); + if (get_realpath_sym == NULL) { + LOGE("Failed to find get_realpath __dl__ZNK6soinfo12get_realpathEv"); + + ElfImg_destroy(linker); + + return false; + } + + soinfo_free = (void (*)(SoInfo *))getSymbAddressByPrefix(linker, "__dl__ZL11soinfo_freeP6soinfo"); + if (soinfo_free == NULL) { + LOGE("Failed to find soinfo_free __dl__ZL11soinfo_freeP6soinfo*"); + + ElfImg_destroy(linker); + + return false; + } + + g_module_load_counter = (uint64_t *)getSymbAddress(linker, "__dl__ZL21g_module_load_counter"); + if (g_module_load_counter != NULL) LOGD("found symbol g_module_load_counter"); + + g_module_unload_counter = (uint64_t *)getSymbAddress(linker, "__dl__ZL23g_module_unload_counter"); + if (g_module_unload_counter != NULL) LOGD("found symbol g_module_unload_counter"); + + for (size_t i = 0; i < 1024 / sizeof(void *); i++) { + uintptr_t possible_field = (uintptr_t)solist + i * sizeof(void *); + size_t possible_size_of_somain = *(size_t *)((uintptr_t)somain + i * sizeof(void *)); + + if (possible_size_of_somain < 0x100000 && possible_size_of_somain > 0x100) { + solist_size_offset = i * sizeof(void *); + + LOGD("solist_size_offset is %zu * %zu = %p", i, sizeof(void *), (void *)solist_size_offset); + } + + if (*(void **)possible_field == somain || (vdso != NULL && *(void **)possible_field == vdso)) { + solist_next_offset = i * sizeof(void *); + LOGD("solist_next_offset is %zu * %zu = %p", i, sizeof(void *), (void *)solist_next_offset); + + break; + } + } + + ElfImg_destroy(linker); + + return true; +} + +bool solist_drop_so_path(const char *target_path) { + if (solist == NULL && !solist_init()) { + LOGE("Failed to initialize solist"); + + return false; + } + + for (SoInfo *iter = solist; iter; iter = get_next(iter)) { + if (get_path(iter) && strstr(get_path(iter), target_path)) { + pdg_protect(); + + LOGV("dropping solist record loaded at %s with size %zu", get_path(iter), get_size(iter)); + if (get_size(iter) > 0) { + set_size(iter, 0); + soinfo_free(iter); + + pdg_unprotect(); + + return true; + } + + pdg_unprotect(); + } + } + + return false; +} + +void solist_reset_counters(size_t load, size_t unload) { + if (solist == NULL && !solist_init()) { + LOGE("Failed to initialize solist"); + + return; + } + + if (g_module_load_counter == NULL || g_module_unload_counter == NULL) { + LOGD("g_module counters not defined, skip reseting them"); + + return; + } + + uint64_t loaded_modules = *g_module_load_counter; + uint64_t unloaded_modules = *g_module_unload_counter; + + if (loaded_modules >= load) { + *g_module_load_counter = loaded_modules - load; + + LOGD("reset g_module_load_counter to %zu", (size_t) *g_module_load_counter); + } + + if (unloaded_modules >= unload) { + *g_module_unload_counter = unloaded_modules - unload; + + LOGD("reset g_module_unload_counter to %zu", (size_t) *g_module_unload_counter); + } +} From 5b3d9c75fdd26d3338f3585032fa8163c2291d93 Mon Sep 17 00:00:00 2001 From: ThePedroo Date: Sat, 12 Apr 2025 23:26:17 -0300 Subject: [PATCH 33/46] remove: open file helpers This commit remove the `open_...` and `xopen_...` helpers, making the code simpler and more direct. --- loader/src/common/files.cpp | 38 +++++++----------------- loader/src/include/files.hpp | 35 ---------------------- loader/src/injector/hook.cpp | 56 +++++++++++++++++++++++++----------- 3 files changed, 50 insertions(+), 79 deletions(-) diff --git a/loader/src/common/files.cpp b/loader/src/common/files.cpp index ade40de..e5950cc 100644 --- a/loader/src/common/files.cpp +++ b/loader/src/common/files.cpp @@ -25,12 +25,17 @@ void file_readline(bool trim, FILE *fp, const std::function &fn) { - if (auto fp = open_file(file, "re")) - file_readline(trim, fp.get(), fn); -} void file_readline(const char *file, const std::function &fn) { - file_readline(false, file, fn); + FILE *fp = fopen(file, "re"); + if (!fp) { + PLOGE("Failed to open file %s", file); + + return; + } + + file_readline(false, fp, fn); + + fclose(fp); } std::vector parse_mount_info(const char *pid) { @@ -112,26 +117,3 @@ std::vector parse_mount_info(const char *pid) { }); return result; } - -sDIR make_dir(DIR *dp) { - return sDIR(dp, [](DIR *dp){ return dp ? closedir(dp) : 1; }); -} - -sFILE make_file(FILE *fp) { - return sFILE(fp, [](FILE *fp){ return fp ? fclose(fp) : 1; }); -} - -int get_path_from_fd(int fd, char *buf, size_t size) { - if (fd < 0 || !buf || size == 0) return -1; - - /* NOTE: We assume that the path is always at /data/adb/modules/xxx - which should never be longer than 128 chars. */ - char proc_path[128]; - snprintf(proc_path, sizeof(proc_path), "/proc/self/fd/%d", fd); - - ssize_t len = readlink(proc_path, buf, size - 1); - if (len == -1) return -1; - - buf[len] = '\0'; - return 0; -} \ No newline at end of file diff --git a/loader/src/include/files.hpp b/loader/src/include/files.hpp index 4f16e0c..ce49e8f 100644 --- a/loader/src/include/files.hpp +++ b/loader/src/include/files.hpp @@ -21,39 +21,4 @@ struct mount_info { std::string fs_option; }; -void file_readline(bool trim, FILE *fp, const std::function &fn); -void file_readline(bool trim, const char *file, const std::function &fn); -void file_readline(const char *file, const std::function &fn); - std::vector parse_mount_info(const char *pid); - -int get_path_from_fd(int fd, char *buf, size_t size); - -using sFILE = std::unique_ptr; -using sDIR = std::unique_ptr; -sDIR make_dir(DIR *dp); -sFILE make_file(FILE *fp); - -static inline sDIR open_dir(const char *path) { - return make_dir(opendir(path)); -} - -static inline sDIR xopen_dir(const char *path) { - return make_dir(opendir(path)); -} - -static inline sDIR xopen_dir(int dirfd) { - return make_dir(fdopendir(dirfd)); -} - -static inline sFILE open_file(const char *path, const char *mode) { - return make_file(fopen(path, mode)); -} - -static inline sFILE xopen_file(const char *path, const char *mode) { - return make_file(fopen(path, mode)); -} - -static inline sFILE xopen_file(int fd, const char *mode) { - return make_file(fdopen(fd, mode)); -} diff --git a/loader/src/injector/hook.cpp b/loader/src/injector/hook.cpp index c3abc4c..6a63979 100644 --- a/loader/src/injector/hook.cpp +++ b/loader/src/injector/hook.cpp @@ -1,4 +1,3 @@ -#include #include #include #include @@ -10,9 +9,12 @@ #include #include +#include +#include #include #include #include + #include #include "daemon.h" @@ -487,25 +489,38 @@ int sigmask(int how, int signum) { } void ZygiskContext::fork_pre() { - // Do our own fork before loading any 3rd party code - // First block SIGCHLD, unblock after original fork is done + /* INFO: Do our own fork before loading any 3rd party code. + First block SIGCHLD, unblock after original fork is done. + */ sigmask(SIG_BLOCK, SIGCHLD); pid = old_fork(); if (pid != 0 || flags[SKIP_FD_SANITIZATION]) return; - // Record all open fds - auto dir = xopen_dir("/proc/self/fd"); - for (dirent *entry; (entry = readdir(dir.get()));) { + /* INFO: Record all open fds */ + DIR *dir = opendir("/proc/self/fd"); + if (dir == nullptr) { + PLOGE("Failed to open /proc/self/fd"); + + return; + } + + struct dirent *entry; + while ((entry = readdir(dir))) { int fd = parse_int(entry->d_name); if (fd < 0 || fd >= MAX_FD_SIZE) { close(fd); + continue; } + allowed_fds[fd] = true; } - // The dirfd should not be allowed - allowed_fds[dirfd(dir.get())] = false; + + /* INFO: The dirfd should not be allowed */ + allowed_fds[dirfd(dir)] = false; + + closedir(dir); } void ZygiskContext::sanitize_fds() { @@ -554,14 +569,23 @@ void ZygiskContext::sanitize_fds() { return; // Close all forbidden fds to prevent crashing - auto dir = open_dir("/proc/self/fd"); - int dfd = dirfd(dir.get()); - for (dirent *entry; (entry = readdir(dir.get()));) { - int fd = parse_int(entry->d_name); - if ((fd < 0 || fd >= MAX_FD_SIZE || !allowed_fds[fd]) && fd != dfd) { - close(fd); - } + DIR *dir = opendir("/proc/self/fd"); + if (dir == nullptr) { + PLOGE("Failed to open /proc/self/fd"); + + return; } + + int dfd = dirfd(dir); + struct dirent *entry; + while ((entry = readdir(dir))) { + int fd = parse_int(entry->d_name); + if (fd == dfd || allowed_fds[fd] || fd < 0 || fd < MAX_FD_SIZE) continue; + + close(fd); + } + + closedir(dir); } void ZygiskContext::fork_post() { @@ -616,7 +640,7 @@ void ZygiskContext::run_modules_post() { if (modules.size() > 0) { LOGD("modules unloaded: %zu/%zu", modules_unloaded, modules.size()); - clean_trace("/data/adb/rezygisk", modules.size(), modules_unloaded, true); + clean_trace("/data/adb", modules.size(), modules_unloaded, true); } } From 2d80ce6935562637e156a42ea0636d9f2c5320f8 Mon Sep 17 00:00:00 2001 From: Stillhard Date: Sun, 13 Apr 2025 09:54:35 +0700 Subject: [PATCH 34/46] fix: SELinux rules (#130) This commit allows Zygote to access files in /data/adb, so that it can load the Zygisk modules. Signed-off-by: Stillhard --- module/src/sepolicy.rule | 1 + 1 file changed, 1 insertion(+) diff --git a/module/src/sepolicy.rule b/module/src/sepolicy.rule index 859f87f..76835a1 100644 --- a/module/src/sepolicy.rule +++ b/module/src/sepolicy.rule @@ -9,6 +9,7 @@ allow zygote su dir search allow zygote su {lnk_file file} read allow zygote adb_data_file dir search +allow zygote adb_data_file file * allow zygote zygote process execmem allow system_server system_server process execmem allow zygote tmpfs file * From c37a5b1c8e0cfa00d3cec3875e42c0281c600462 Mon Sep 17 00:00:00 2001 From: Breathleas <39123978+Breathleas@users.noreply.github.com> Date: Mon, 14 Apr 2025 06:12:08 +0800 Subject: [PATCH 35/46] fix: missing `status32` exit check (#128) This commit fixes the issue where 32-bit daemon wouldn't be checked for exits, as the macro hardcoded "status64". Signed-off-by: Breathleas <39123978+Breathleas@users.noreply.github.com> Co-authored-by: anyusec <145352653+anyusec@users.noreply.github.com> Co-authored-by: Pedro.js --- loader/src/ptracer/monitor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/src/ptracer/monitor.cpp b/loader/src/ptracer/monitor.cpp index af7f28c..d02e563 100644 --- a/loader/src/ptracer/monitor.cpp +++ b/loader/src/ptracer/monitor.cpp @@ -438,7 +438,7 @@ static bool ensure_daemon_created(bool is_64bit) { } #define CHECK_DAEMON_EXIT(abi) \ - if (status##abi.supported && pid == status64.daemon_pid) { \ + if (status##abi.supported && pid == status##abi.daemon_pid) { \ char status_str[64]; \ parse_status(status, status_str, sizeof(status_str)); \ \ From 1a3f497e1a2c5da5d79dc756b074c00d6d75c556 Mon Sep 17 00:00:00 2001 From: ThePedroo Date: Mon, 14 Apr 2025 00:54:24 -0300 Subject: [PATCH 36/46] improve: port `common` code to C This commit ports even more C++ code to C99, now, the codes available in the "common" folder. --- loader/src/common/daemon.c | 365 ++++++++++++++++++++++ loader/src/common/daemon.cpp | 279 ----------------- loader/src/common/files.cpp | 119 ------- loader/src/common/misc.c | 14 + loader/src/common/misc.cpp | 49 --- loader/src/common/socket_utils.c | 95 ++++++ loader/src/common/socket_utils.cpp | 137 -------- loader/src/include/daemon.h | 126 +++----- loader/src/include/elf_util.h | 2 - loader/src/include/files.hpp | 24 -- loader/src/include/misc.h | 17 + loader/src/include/misc.hpp | 98 ------ loader/src/include/socket_utils.h | 40 +-- loader/src/injector/art_method.hpp | 1 + loader/src/injector/entry.cpp | 5 +- loader/src/injector/hook.cpp | 67 ++-- loader/src/{include => injector}/solist.h | 1 - loader/src/ptracer/main.cpp | 18 +- loader/src/ptracer/monitor.cpp | 19 +- loader/src/ptracer/ptracer.cpp | 14 +- 20 files changed, 633 insertions(+), 857 deletions(-) create mode 100644 loader/src/common/daemon.c delete mode 100644 loader/src/common/daemon.cpp delete mode 100644 loader/src/common/files.cpp create mode 100644 loader/src/common/misc.c delete mode 100644 loader/src/common/misc.cpp create mode 100644 loader/src/common/socket_utils.c delete mode 100644 loader/src/common/socket_utils.cpp delete mode 100644 loader/src/include/files.hpp create mode 100644 loader/src/include/misc.h delete mode 100644 loader/src/include/misc.hpp rename loader/src/{include => injector}/solist.h (99%) diff --git a/loader/src/common/daemon.c b/loader/src/common/daemon.c new file mode 100644 index 0000000..4a4b836 --- /dev/null +++ b/loader/src/common/daemon.c @@ -0,0 +1,365 @@ +// #include +// #include +// #include +// #include +// #include +#include +#include +#include +#include + +#include + +#include "logging.h" +#include "socket_utils.h" + +#include "daemon.h" + +char daemon_path[PATH_MAX]; + +void rezygiskd_init(const char *path) { + snprintf(daemon_path, sizeof(daemon_path), "%s/%s", path, SOCKET_FILE_NAME); +} + +void rezygiskd_get_path(char *buf, size_t buf_size) { + size_t fileless_daemon_path = strlen(daemon_path) - strlen("/") - strlen(SOCKET_FILE_NAME); + + strncpy(buf, daemon_path, buf_size > fileless_daemon_path ? fileless_daemon_path : buf_size); + buf[fileless_daemon_path] = '\0'; +} + +int rezygiskd_connect(uint8_t retry) { + retry++; + + int fd = socket(PF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0); + if (fd == -1) { + PLOGE("socket create"); + + return -1; + } + + struct sockaddr_un addr = { + .sun_family = AF_UNIX, + .sun_path = { 0 } + }; + + /* + INFO: Application must assume that sun_path can hold _POSIX_PATH_MAX characters. + + Sources: + - https://pubs.opengroup.org/onlinepubs/009696699/basedefs/sys/un.h.html + */ + strcpy(addr.sun_path, daemon_path); + socklen_t socklen = sizeof(addr); + + while (--retry) { + int ret = connect(fd, (struct sockaddr *)&addr, socklen); + if (ret == 0) return fd; + if (retry) { + PLOGE("Retrying to connect to ReZygiskd, sleep 1s"); + + sleep(1); + } + } + + close(fd); + + return -1; +} + +bool rezygiskd_ping() { + int fd = rezygiskd_connect(5); + if (fd == -1) { + PLOGE("connection to ReZygiskd"); + + return false; + } + + write_uint8_t(fd, (uint8_t)PingHeartbeat); + + close(fd); + + return true; +} + +uint32_t rezygiskd_get_process_flags(uid_t uid) { + int fd = rezygiskd_connect(1); + if (fd == -1) { + PLOGE("connection to ReZygiskd"); + + return 0; + } + + write_uint8_t(fd, (uint8_t)GetProcessFlags); + write_uint32_t(fd, (uint32_t)uid); + + uint32_t res = 0; + read_uint32_t(fd, &res); + + close(fd); + + return res; +} + +void rezygiskd_get_info(struct rezygisk_info *info) { + int fd = rezygiskd_connect(1); + if (fd == -1) { + PLOGE("connection to ReZygiskd"); + + info->running = false; + + return; + } + + info->running = true; + + write_uint8_t(fd, (uint8_t)GetInfo); + + uint32_t flags = 0; + read_uint32_t(fd, &flags); + + if (flags & (1 << 27)) info->root_impl = ROOT_IMPL_APATCH; + else if (flags & (1 << 29)) info->root_impl = ROOT_IMPL_KERNELSU; + else if (flags & (1 << 30)) info->root_impl = ROOT_IMPL_MAGISK; + else info->root_impl = ROOT_IMPL_NONE; + + read_uint32_t(fd, (uint32_t *)&info->pid); + + read_size_t(fd, &info->modules->modules_count); + if (info->modules->modules_count == 0) { + info->modules->modules = NULL; + + close(fd); + + return; + } + + info->modules->modules = (char **)malloc(sizeof(char *) * info->modules->modules_count); + if (info->modules->modules == NULL) { + PLOGE("allocating modules name memory"); + + free(info->modules); + info->modules = NULL; + info->modules->modules_count = 0; + + close(fd); + + return; + } + + for (size_t i = 0; i < info->modules->modules_count; i++) { + char *module_name = read_string(fd); + if (module_name == NULL) { + PLOGE("reading module name"); + + info->modules->modules_count = i; + + free_rezygisk_info(info); + + info->modules = NULL; + info->modules->modules_count = 0; + + close(fd); + + return; + } + + char module_path[PATH_MAX]; + snprintf(module_path, sizeof(module_path), "/data/adb/modules/%s/module.prop", module_name); + + FILE *module_prop = fopen(module_path, "r"); + if (!module_prop) { + PLOGE("failed to open module prop file %s", module_path); + + info->modules->modules_count = i; + + free_rezygisk_info(info); + + info->modules = NULL; + info->modules->modules_count = 0; + + close(fd); + + return; + } + + char line[1024]; + while (fgets(line, sizeof(line), module_prop) != NULL) { + if (strncmp(line, "name=", strlen("name=")) != 0) continue; + + info->modules->modules[i] = strndup(line + 5, strlen(line) - 6); + + break; + } + + fclose(module_prop); + } + + close(fd); +} + +void free_rezygisk_info(struct rezygisk_info *info) { + if (info->modules->modules) { + for (size_t i = 0; i < info->modules->modules_count; i++) { + free(info->modules->modules[i]); + } + + free(info->modules->modules); + } + + free(info->modules); +} + +bool rezygiskd_read_modules(struct zygisk_modules *modules) { + int fd = rezygiskd_connect(1); + if (fd == -1) { + PLOGE("connection to ReZygiskd"); + + return false; + } + + write_uint8_t(fd, (uint8_t)ReadModules); + + size_t len = 0; + read_size_t(fd, &len); + + modules->modules = malloc(len * sizeof(char *)); + if (!modules->modules) { + PLOGE("allocating modules name memory"); + + close(fd); + + return false; + } + modules->modules_count = len; + + for (size_t i = 0; i < len; i++) { + char *lib_path = read_string(fd); + if (!lib_path) { + PLOGE("reading module lib_path"); + + close(fd); + + return false; + } + + modules->modules[i] = lib_path; + } + + close(fd); + + return true; +} + +void free_modules(struct zygisk_modules *modules) { + if (modules->modules) { + for (size_t i = 0; i < modules->modules_count; i++) { + free(modules->modules[i]); + } + + free(modules->modules); + } +} + +int rezygiskd_connect_companion(size_t index) { + int fd = rezygiskd_connect(1); + if (fd == -1) { + PLOGE("connection to ReZygiskd"); + + return -1; + } + + write_uint8_t(fd, (uint8_t)RequestCompanionSocket); + write_size_t(fd, index); + + uint8_t res = 0; + read_uint8_t(fd, &res); + + if (res == 1) return fd; + else { + close(fd); + + return -1; + } +} + +int rezygiskd_get_module_dir(size_t index) { + int fd = rezygiskd_connect(1); + if (fd == -1) { + PLOGE("connection to ReZygiskd"); + + return -1; + } + + write_uint8_t(fd, (uint8_t)GetModuleDir); + write_size_t(fd, index); + + int dirfd = read_fd(fd); + + close(fd); + + return dirfd; +} + +void rezygiskd_zygote_restart() { + int fd = rezygiskd_connect(1); + if (fd == -1) { + if (errno == ENOENT) LOGD("Could not notify ZygoteRestart (maybe it hasn't been created)"); + else PLOGE("Could not notify ZygoteRestart"); + + return; + } + + if (!write_uint8_t(fd, (uint8_t)ZygoteRestart)) + PLOGE("Failed to request ZygoteRestart"); + + close(fd); +} + +void rezygiskd_system_server_started() { + int fd = rezygiskd_connect(1); + if (fd == -1) { + PLOGE("Failed to report system server started"); + + return; + } + + if (!write_uint8_t(fd, (uint8_t)SystemServerStarted)) + PLOGE("Failed to request SystemServerStarted"); + + close(fd); +} + +bool rezygiskd_update_mns(enum mount_namespace_state nms_state, char *buf, size_t buf_size) { + int fd = rezygiskd_connect(1); + if (fd == -1) { + PLOGE("connection to ReZygiskd"); + + return false; + } + + write_uint8_t(fd, (uint8_t)UpdateMountNamespace); + write_uint32_t(fd, (uint32_t)getpid()); + write_uint8_t(fd, (uint8_t)nms_state); + + uint32_t target_pid = 0; + read_uint32_t(fd, &target_pid); + if (target_pid == 0) { + close(fd); + + return false; + } + + int target_fd = read_fd(fd); + if (target_fd == -1) { + close(fd); + + return false; + } + + snprintf(buf, buf_size, "/proc/%u/fd/%u", target_pid, target_fd); + + close(fd); + + return true; +} diff --git a/loader/src/common/daemon.cpp b/loader/src/common/daemon.cpp deleted file mode 100644 index 44c7660..0000000 --- a/loader/src/common/daemon.cpp +++ /dev/null @@ -1,279 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include - -#include "daemon.h" -#include "socket_utils.h" - -namespace zygiskd { - static std::string TMP_PATH; - void Init(const char *path) { - TMP_PATH = path; - } - - std::string GetTmpPath() { - return TMP_PATH; - } - - int Connect(uint8_t retry) { - retry++; - - int fd = socket(PF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0); - struct sockaddr_un addr = { - .sun_family = AF_UNIX, - .sun_path = { 0 } - }; - - auto socket_path = TMP_PATH + kCPSocketName; - strcpy(addr.sun_path, socket_path.c_str()); - socklen_t socklen = sizeof(addr); - - while (--retry) { - int r = connect(fd, (struct sockaddr *)&addr, socklen); - if (r == 0) return fd; - if (retry) { - PLOGE("Retrying to connect to zygiskd, sleep 1s"); - - sleep(1); - } - } - - close(fd); - - return -1; - } - - bool PingHeartbeat() { - int fd = Connect(5); - if (fd == -1) { - PLOGE("Connect to zygiskd"); - - return false; - } - - socket_utils::write_u8(fd, (uint8_t) SocketAction::PingHeartBeat); - - close(fd); - - return true; - } - - uint32_t GetProcessFlags(uid_t uid) { - int fd = Connect(1); - if (fd == -1) { - PLOGE("GetProcessFlags"); - - return 0; - } - - socket_utils::write_u8(fd, (uint8_t) SocketAction::GetProcessFlags); - socket_utils::write_u32(fd, uid); - - uint32_t res = socket_utils::read_u32(fd); - - close(fd); - - return res; - } - - std::vector ReadModules() { - std::vector modules; - int fd = Connect(1); - if (fd == -1) { - PLOGE("ReadModules"); - - return modules; - } - - socket_utils::write_u8(fd, (uint8_t) SocketAction::ReadModules); - size_t len = socket_utils::read_usize(fd); - for (size_t i = 0; i < len; i++) { - std::string lib_path = socket_utils::read_string(fd); - std::string name = socket_utils::read_string(fd); - modules.emplace_back(lib_path, name); - } - - close(fd); - - return modules; - } - - int ConnectCompanion(size_t index) { - int fd = Connect(1); - if (fd == -1) { - PLOGE("ConnectCompanion"); - - return -1; - } - - socket_utils::write_u8(fd, (uint8_t) SocketAction::RequestCompanionSocket); - socket_utils::write_usize(fd, index); - - uint8_t res = socket_utils::read_u8(fd); - - if (res == 1) return fd; - else { - close(fd); - - return -1; - } - } - - int GetModuleDir(size_t index) { - int fd = Connect(1); - if (fd == -1) { - PLOGE("GetModuleDir"); - - return -1; - } - - socket_utils::write_u8(fd, (uint8_t) SocketAction::GetModuleDir); - socket_utils::write_usize(fd, index); - int nfd = socket_utils::recv_fd(fd); - - close(fd); - - return nfd; - } - - void ZygoteRestart() { - int fd = Connect(1); - if (fd == -1) { - if (errno == ENOENT) LOGD("Could not notify ZygoteRestart (maybe it hasn't been created)"); - else PLOGE("Could not notify ZygoteRestart"); - - return; - } - - if (!socket_utils::write_u8(fd, (uint8_t) SocketAction::ZygoteRestart)) - PLOGE("Failed to request ZygoteRestart"); - - close(fd); - } - - void SystemServerStarted() { - int fd = Connect(1); - if (fd == -1) PLOGE("Failed to report system server started"); - else { - if (!socket_utils::write_u8(fd, (uint8_t) SocketAction::SystemServerStarted)) - PLOGE("Failed to report system server started"); - } - - close(fd); - } - - void GetInfo(struct zygote_info *info) { - /* TODO: Optimize and avoid re-connect twice here */ - int fd = Connect(1); - - if (fd != -1) { - info->running = true; - - socket_utils::write_u8(fd, (uint8_t) SocketAction::GetInfo); - - int flags = socket_utils::read_u32(fd); - - if (flags & (1 << 27)) { - info->root_impl = ZYGOTE_ROOT_IMPL_APATCH; - } else if (flags & (1 << 29)) { - info->root_impl = ZYGOTE_ROOT_IMPL_KERNELSU; - } else if (flags & (1 << 30)) { - info->root_impl = ZYGOTE_ROOT_IMPL_MAGISK; - } else { - info->root_impl = ZYGOTE_ROOT_IMPL_NONE; - } - - info->pid = socket_utils::read_u32(fd); - - info->modules = (struct zygote_modules *)malloc(sizeof(struct zygote_modules)); - if (info->modules == NULL) { - info->modules->modules_count = 0; - - close(fd); - - return; - } - - info->modules->modules_count = socket_utils::read_usize(fd); - - if (info->modules->modules_count == 0) { - info->modules->modules = NULL; - - close(fd); - - return; - } - - info->modules->modules = (char **)malloc(sizeof(char *) * info->modules->modules_count); - if (info->modules->modules == NULL) { - free(info->modules); - info->modules = NULL; - info->modules->modules_count = 0; - - close(fd); - - return; - } - - for (size_t i = 0; i < info->modules->modules_count; i++) { - /* INFO by ThePedroo: Ugly solution to read with std::string existance (temporary) */ - std::string name = socket_utils::read_string(fd); - - char module_path[PATH_MAX]; - snprintf(module_path, sizeof(module_path), "/data/adb/modules/%s/module.prop", name.c_str()); - - FILE *module_prop = fopen(module_path, "r"); - if (module_prop == NULL) { - info->modules->modules[i] = strdup(name.c_str()); - } else { - char line[1024]; - while (fgets(line, sizeof(line), module_prop) != NULL) { - if (strncmp(line, "name=", 5) == 0) { - info->modules->modules[i] = strndup(line + 5, strlen(line) - 6); - - break; - } - } - - fclose(module_prop); - } - } - - close(fd); - } else info->running = false; - } - - std::string UpdateMountNamespace(enum mount_namespace_state nms_state) { - int fd = Connect(1); - if (fd == -1) { - PLOGE("UpdateMountNamespace"); - - return ""; - } - - socket_utils::write_u8(fd, (uint8_t) SocketAction::UpdateMountNamespace); - socket_utils::write_u32(fd, getpid()); - socket_utils::write_u8(fd, (uint8_t)nms_state); - - uint32_t target_pid = socket_utils::read_u32(fd); - int target_fd = 0; - - if (target_pid == 0) goto error; - - target_fd = (int)socket_utils::read_u32(fd); - if (target_fd == 0) goto error; - - close(fd); - - return "/proc/" + std::to_string(target_pid) + "/fd/" + std::to_string(target_fd); - - error: - close(fd); - - return ""; - } -} diff --git a/loader/src/common/files.cpp b/loader/src/common/files.cpp deleted file mode 100644 index e5950cc..0000000 --- a/loader/src/common/files.cpp +++ /dev/null @@ -1,119 +0,0 @@ -#include - -#include "files.hpp" -#include "misc.hpp" - -using namespace std::string_view_literals; - -void file_readline(bool trim, FILE *fp, const std::function &fn) { - size_t len = 1024; - char *buf = (char *) malloc(len); - char *start; - ssize_t read; - while ((read = getline(&buf, &len, fp)) >= 0) { - start = buf; - if (trim) { - while (read && "\n\r "sv.find(buf[read - 1]) != std::string::npos) - --read; - buf[read] = '\0'; - while (*start == ' ') - ++start; - } - if (!fn(start)) - break; - } - free(buf); -} - -void file_readline(const char *file, const std::function &fn) { - FILE *fp = fopen(file, "re"); - if (!fp) { - PLOGE("Failed to open file %s", file); - - return; - } - - file_readline(false, fp, fn); - - fclose(fp); -} - -std::vector parse_mount_info(const char *pid) { - char buf[PATH_MAX] = {}; - snprintf(buf, sizeof(buf), "/proc/%s/mountinfo", pid); - std::vector result; - - file_readline(buf, [&result](std::string_view line) -> bool { - int root_start = 0, root_end = 0; - int target_start = 0, target_end = 0; - int vfs_option_start = 0, vfs_option_end = 0; - int type_start = 0, type_end = 0; - int source_start = 0, source_end = 0; - int fs_option_start = 0, fs_option_end = 0; - int optional_start = 0, optional_end = 0; - unsigned int id, parent, maj, min; - sscanf(line.data(), - "%u " // (1) id - "%u " // (2) parent - "%u:%u " // (3) maj:min - "%n%*s%n " // (4) mountroot - "%n%*s%n " // (5) target - "%n%*s%n" // (6) vfs options (fs-independent) - "%n%*[^-]%n - " // (7) optional fields - "%n%*s%n " // (8) FS type - "%n%*s%n " // (9) source - "%n%*s%n", // (10) fs options (fs specific) - &id, &parent, &maj, &min, &root_start, &root_end, &target_start, - &target_end, &vfs_option_start, &vfs_option_end, - &optional_start, &optional_end, &type_start, &type_end, - &source_start, &source_end, &fs_option_start, &fs_option_end); - - auto root = line.substr(root_start, root_end - root_start); - auto target = line.substr(target_start, target_end - target_start); - auto vfs_option = - line.substr(vfs_option_start, vfs_option_end - vfs_option_start); - ++optional_start; - --optional_end; - auto optional = line.substr( - optional_start, - optional_end - optional_start > 0 ? optional_end - optional_start : 0); - - auto type = line.substr(type_start, type_end - type_start); - auto source = line.substr(source_start, source_end - source_start); - auto fs_option = - line.substr(fs_option_start, fs_option_end - fs_option_start); - - unsigned int shared = 0; - unsigned int master = 0; - unsigned int propagate_from = 0; - if (auto pos = optional.find("shared:"); pos != std::string_view::npos) { - shared = parse_int(optional.substr(pos + 7)); - } - if (auto pos = optional.find("master:"); pos != std::string_view::npos) { - master = parse_int(optional.substr(pos + 7)); - } - if (auto pos = optional.find("propagate_from:"); - pos != std::string_view::npos) { - propagate_from = parse_int(optional.substr(pos + 15)); - } - - result.emplace_back(mount_info { - .id = id, - .parent = parent, - .device = static_cast(makedev(maj, min)), - .root {root}, - .target {target}, - .vfs_option {vfs_option}, - .optional { - .shared = shared, - .master = master, - .propagate_from = propagate_from, - }, - .type {type}, - .source {source}, - .fs_option {fs_option}, - }); - return true; - }); - return result; -} diff --git a/loader/src/common/misc.c b/loader/src/common/misc.c new file mode 100644 index 0000000..8d84de4 --- /dev/null +++ b/loader/src/common/misc.c @@ -0,0 +1,14 @@ +int parse_int(const char *str) { + int val = 0; + + char *c = (char *)str; + while (*c) { + if (*c > '9' || *c < '0') + return -1; + + val = val * 10 + *c - '0'; + c++; + } + + return val; +} diff --git a/loader/src/common/misc.cpp b/loader/src/common/misc.cpp deleted file mode 100644 index 0881664..0000000 --- a/loader/src/common/misc.cpp +++ /dev/null @@ -1,49 +0,0 @@ -#include "misc.hpp" - -int new_daemon_thread(thread_entry entry, void *arg) { - pthread_t thread; - pthread_attr_t attr; - pthread_attr_init(&attr); - pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); - errno = pthread_create(&thread, &attr, entry, arg); - if (errno) { - PLOGE("pthread_create"); - } - return errno; -} - -int parse_int(std::string_view s) { - int val = 0; - for (char c : s) { - if (!c) break; - if (c > '9' || c < '0') - return -1; - val = val * 10 + c - '0'; - } - return val; -} - -std::list split_str(std::string_view s, std::string_view delimiter) { - std::list ret; - size_t pos = 0; - while (pos < s.size()) { - auto next = s.find(delimiter, pos); - if (next == std::string_view::npos) { - ret.emplace_back(s.substr(pos)); - break; - } - ret.emplace_back(s.substr(pos, next - pos)); - pos = next + delimiter.size(); - } - return ret; -} - -std::string join_str(const std::list& list, std::string_view delimiter) { - std::string ret; - for (auto& s : list) { - if (!ret.empty()) - ret += delimiter; - ret += s; - } - return ret; -} diff --git a/loader/src/common/socket_utils.c b/loader/src/common/socket_utils.c new file mode 100644 index 0000000..24bddc0 --- /dev/null +++ b/loader/src/common/socket_utils.c @@ -0,0 +1,95 @@ +#include +#include +#include + +#include + +#include "logging.h" + +#include "socket_utils.h" + +/* TODO: Standardize how to log errors */ +int read_fd(int fd) { + char cmsgbuf[CMSG_SPACE(sizeof(int))]; + + int cnt = 1; + struct iovec iov = { + .iov_base = &cnt, + .iov_len = sizeof(cnt) + }; + + struct msghdr msg = { + .msg_iov = &iov, + .msg_iovlen = 1, + .msg_control = cmsgbuf, + .msg_controllen = sizeof(cmsgbuf) + }; + + ssize_t ret = recvmsg(fd, &msg, MSG_WAITALL); + if (ret == -1) { + PLOGE("recvmsg"); + + return -1; + } + + struct cmsghdr *cmsg = CMSG_FIRSTHDR(&msg); + if (cmsg == NULL) { + PLOGE("CMSG_FIRSTHDR"); + + return -1; + } + + int sendfd; + memcpy(&sendfd, CMSG_DATA(cmsg), sizeof(int)); + + return sendfd; +} + +char *read_string(int fd) { + size_t str_len = 0; + ssize_t read_bytes = read(fd, &str_len, sizeof(size_t)); + if (read_bytes != (ssize_t)sizeof(size_t)) { + LOGE("Failed to read string length: Not all bytes were read (%zd != %zu).\n", read_bytes, sizeof(size_t)); + + return NULL; + } + + char *buf = malloc(str_len + 1); + if (buf == NULL) { + PLOGE("allocate memory for string"); + + return NULL; + } + + read_bytes = read(fd, buf, str_len); + if (read_bytes != (ssize_t)str_len) { + LOGE("Failed to read string: Promised bytes doesn't exist (%zd != %zu).\n", read_bytes, str_len); + + free(buf); + + return NULL; + } + + if (str_len > 0) buf[str_len] = '\0'; + + return buf; +} + +#define write_func(type) \ + ssize_t write_## type(int fd, type val) { \ + return write(fd, &val, sizeof(type)); \ + } + +#define read_func(type) \ + ssize_t read_## type(int fd, type *val) { \ + return read(fd, val, sizeof(type)); \ + } + +write_func(uint8_t) +read_func(uint8_t) + +write_func(uint32_t) +read_func(uint32_t) + +write_func(size_t) +read_func(size_t) diff --git a/loader/src/common/socket_utils.cpp b/loader/src/common/socket_utils.cpp deleted file mode 100644 index 730d49d..0000000 --- a/loader/src/common/socket_utils.cpp +++ /dev/null @@ -1,137 +0,0 @@ -#include -#include -#include - -#include "socket_utils.h" - -namespace socket_utils { - ssize_t xread(int fd, void* buf, size_t count) { - size_t read_sz = 0; - ssize_t ret; - do { - ret = read(fd, (std::byte*) buf + read_sz, count - read_sz); - if (ret < 0) { - if (errno == EINTR) continue; - PLOGE("read"); - return ret; - } - read_sz += ret; - } while (read_sz != count && ret != 0); - if (read_sz != count) { - PLOGE("read (%zu != %zu)", count, read_sz); - } - return read_sz; - } - - size_t xwrite(int fd, const void* buf, size_t count) { - size_t write_sz = 0; - ssize_t ret; - do { - ret = write(fd, (std::byte*) buf + write_sz, count - write_sz); - if (ret < 0) { - if (errno == EINTR) continue; - PLOGE("write"); - return write_sz; - } - write_sz += ret; - } while (write_sz != count && ret != 0); - if (write_sz != count) { - PLOGE("write (%zu != %zu)", count, write_sz); - } - return write_sz; - } - - ssize_t xrecvmsg(int sockfd, struct msghdr* msg, int flags) { - int rec = recvmsg(sockfd, msg, flags); - if (rec < 0) PLOGE("recvmsg"); - return rec; - } - - template - inline T read_exact_or(int fd, T fail) { - T res; - return sizeof(T) == xread(fd, &res, sizeof(T)) ? res : fail; - } - - template - inline bool write_exact(int fd, T val) { - return sizeof(T) == xwrite(fd, &val, sizeof(T)); - } - - uint8_t read_u8(int fd) { - return read_exact_or(fd, 0); - } - - uint32_t read_u32(int fd) { - return read_exact_or(fd, 0); - } - - size_t read_usize(int fd) { - return read_exact_or(fd, 0); - } - - bool write_usize(int fd, size_t val) { - return write_exact(fd, val); - } - - std::string read_string(int fd) { - size_t len = read_usize(fd); - - char buf[len + 1]; - xread(fd, buf, len); - - buf[len] = '\0'; - - return buf; - } - - bool write_u8(int fd, uint8_t val) { - return write_exact(fd, val); - } - - void* recv_fds(int sockfd, char* cmsgbuf, size_t bufsz, int cnt) { - iovec iov = { - .iov_base = &cnt, - .iov_len = sizeof(cnt), - }; - msghdr msg = { - .msg_iov = &iov, - .msg_iovlen = 1, - .msg_control = cmsgbuf, - .msg_controllen = bufsz - }; - - xrecvmsg(sockfd, &msg, MSG_WAITALL); - cmsghdr* cmsg = CMSG_FIRSTHDR(&msg); - - if (msg.msg_controllen != bufsz || - cmsg == nullptr || - // TODO: pass from rust: 20, expected: 16 - // cmsg->cmsg_len != CMSG_LEN(sizeof(int) * cnt) || - cmsg->cmsg_level != SOL_SOCKET || - cmsg->cmsg_type != SCM_RIGHTS) { - return nullptr; - } - - return CMSG_DATA(cmsg); - } - - int recv_fd(int sockfd) { - char cmsgbuf[CMSG_SPACE(sizeof(int))]; - - void* data = recv_fds(sockfd, cmsgbuf, sizeof(cmsgbuf), 1); - if (data == nullptr) return -1; - - int result; - memcpy(&result, data, sizeof(int)); - return result; - } - - bool write_u32(int fd, uint32_t val) { - return write_exact(fd, val); - } - - bool write_string(int fd, std::string_view str) { - return write_usize(fd, str.size()) && str.size() == xwrite(fd, str.data(), str.size()); - } -} diff --git a/loader/src/include/daemon.h b/loader/src/include/daemon.h index 9bc3617..977eca5 100644 --- a/loader/src/include/daemon.h +++ b/loader/src/include/daemon.h @@ -1,113 +1,85 @@ -#pragma once +#ifndef DAEMON_H +#define DAEMON_H +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ -#include -#include #include -#include -#if defined(__LP64__) -# define LP_SELECT(lp32, lp64) lp64 +#ifdef __LP64__ + #define LP_SELECT(lp32, lp64) lp64 #else -# define LP_SELECT(lp32, lp64) lp32 + #define LP_SELECT(lp32, lp64) lp32 #endif -constexpr auto kCPSocketName = "/" LP_SELECT("cp32", "cp64") ".sock"; +#define SOCKET_FILE_NAME LP_SELECT("cp32", "cp64") ".sock" -class UniqueFd { - using Fd = int; -public: - UniqueFd() = default; - - UniqueFd(Fd fd) : fd_(fd) {} - - ~UniqueFd() { if (fd_ >= 0) close(fd_); } - - // Disallow copy - UniqueFd(const UniqueFd&) = delete; - - UniqueFd& operator=(const UniqueFd&) = delete; - - // Allow move - UniqueFd(UniqueFd&& other) { std::swap(fd_, other.fd_); } - - UniqueFd& operator=(UniqueFd&& other) { - std::swap(fd_, other.fd_); - return *this; - } - - // Implict cast to Fd - operator const Fd&() const { return fd_; } - -private: - Fd fd_ = -1; +enum rezygiskd_actions { + PingHeartbeat, + GetProcessFlags, + GetInfo, + ReadModules, + RequestCompanionSocket, + GetModuleDir, + ZygoteRestart, + SystemServerStarted, + UpdateMountNamespace }; -struct zygote_modules { +struct zygisk_modules { char **modules; size_t modules_count; }; -enum zygote_root_impl { - ZYGOTE_ROOT_IMPL_NONE, - ZYGOTE_ROOT_IMPL_APATCH, - ZYGOTE_ROOT_IMPL_KERNELSU, - ZYGOTE_ROOT_IMPL_MAGISK +enum root_impl { + ROOT_IMPL_NONE, + ROOT_IMPL_APATCH, + ROOT_IMPL_KERNELSU, + ROOT_IMPL_MAGISK }; -struct zygote_info { - struct zygote_modules *modules; - enum zygote_root_impl root_impl; +struct rezygisk_info { + struct zygisk_modules *modules; + enum root_impl root_impl; pid_t pid; bool running; }; enum mount_namespace_state { - Clean, - Rooted, - Module + Clean, + Rooted, + Module }; -namespace zygiskd { +void rezygiskd_init(const char *path); - struct ModuleInfo { - std::string path; - /* TODO: Perhaps we can also remove this and just send paths? */ - std::string name; +void rezygiskd_get_path(char *buf, size_t buf_size); - inline explicit ModuleInfo(std::string path, std::string name) : path(path), name(name) {} - }; +int rezygiskd_connect(uint8_t retry); - enum class SocketAction { - PingHeartBeat, - GetProcessFlags, - GetInfo, - ReadModules, - RequestCompanionSocket, - GetModuleDir, - ZygoteRestart, - SystemServerStarted, - UpdateMountNamespace - }; +bool rezygiskd_ping(); - void Init(const char *path); +uint32_t rezygiskd_get_process_flags(uid_t uid); - std::string GetTmpPath(); +void rezygiskd_get_info(struct rezygisk_info *info); - bool PingHeartbeat(); +void free_rezygisk_info(struct rezygisk_info *info); - std::vector ReadModules(); +bool rezygiskd_read_modules(struct zygisk_modules *modules); +void free_modules(struct zygisk_modules *modules); - uint32_t GetProcessFlags(uid_t uid); +int rezygiskd_connect_companion(size_t index); - int ConnectCompanion(size_t index); +int rezygiskd_get_module_dir(size_t index); - int GetModuleDir(size_t index); +void rezygiskd_zygote_restart(); - void ZygoteRestart(); +void rezygiskd_system_server_started(); - void SystemServerStarted(); +bool rezygiskd_update_mns(enum mount_namespace_state nms_state, char *buf, size_t buf_size); - void GetInfo(struct zygote_info *info); - - std::string UpdateMountNamespace(enum mount_namespace_state mns_state); +#ifdef __cplusplus } +#endif /* __cplusplus */ + +#endif /* DAEMON_H */ \ No newline at end of file diff --git a/loader/src/include/elf_util.h b/loader/src/include/elf_util.h index fd24ecd..e1c4949 100644 --- a/loader/src/include/elf_util.h +++ b/loader/src/include/elf_util.h @@ -6,8 +6,6 @@ #include #include -#define restrict /* INFO: Temporary measure */ - #define SHT_GNU_HASH 0x6ffffff6 struct symtabs { diff --git a/loader/src/include/files.hpp b/loader/src/include/files.hpp deleted file mode 100644 index ce49e8f..0000000 --- a/loader/src/include/files.hpp +++ /dev/null @@ -1,24 +0,0 @@ -#include -#include -#include -#include -#include - -struct mount_info { - unsigned int id; - unsigned int parent; - dev_t device; - std::string root; - std::string target; - std::string vfs_option; - struct { - unsigned int shared; - unsigned int master; - unsigned int propagate_from; - } optional; - std::string type; - std::string source; - std::string fs_option; -}; - -std::vector parse_mount_info(const char *pid); diff --git a/loader/src/include/misc.h b/loader/src/include/misc.h new file mode 100644 index 0000000..168b9fb --- /dev/null +++ b/loader/src/include/misc.h @@ -0,0 +1,17 @@ +#ifndef MISC_H + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +/* + * Bionic's atoi runs through strtol(). + * Use our own implementation for faster conversion. + */ +int parse_int(const char *str); + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* MISC_H */ \ No newline at end of file diff --git a/loader/src/include/misc.hpp b/loader/src/include/misc.hpp deleted file mode 100644 index b526145..0000000 --- a/loader/src/include/misc.hpp +++ /dev/null @@ -1,98 +0,0 @@ -#pragma once - -#include -#include -#include -#include -#include - -#include "logging.h" - -#define DISALLOW_COPY_AND_MOVE(clazz) \ -clazz(const clazz &) = delete; \ -clazz(clazz &&) = delete; - -class mutex_guard { - DISALLOW_COPY_AND_MOVE(mutex_guard) -public: - explicit mutex_guard(pthread_mutex_t &m): mutex(&m) { - pthread_mutex_lock(mutex); - } - void unlock() { - pthread_mutex_unlock(mutex); - mutex = nullptr; - } - ~mutex_guard() { - if (mutex) pthread_mutex_unlock(mutex); - } -private: - pthread_mutex_t *mutex; -}; - -using thread_entry = void *(*)(void *); -int new_daemon_thread(thread_entry entry, void *arg); - -static inline bool str_contains(std::string_view s, std::string_view ss) { - return s.find(ss) != std::string_view::npos; -} - -template -class stateless_allocator { -public: - using value_type = T; - T *allocate(size_t num) { return static_cast(Impl::allocate(sizeof(T) * num)); } - void deallocate(T *ptr, size_t num) { Impl::deallocate(ptr, sizeof(T) * num); } - stateless_allocator() = default; - stateless_allocator(const stateless_allocator&) = default; - stateless_allocator(stateless_allocator&&) = default; - template - stateless_allocator(const stateless_allocator&) {} - bool operator==(const stateless_allocator&) { return true; } - bool operator!=(const stateless_allocator&) { return false; } -}; - -template -class reversed_container { -public: - reversed_container(T &base) : base(base) {} - decltype(std::declval().rbegin()) begin() { return base.rbegin(); } - decltype(std::declval().crbegin()) begin() const { return base.crbegin(); } - decltype(std::declval().crbegin()) cbegin() const { return base.crbegin(); } - decltype(std::declval().rend()) end() { return base.rend(); } - decltype(std::declval().crend()) end() const { return base.crend(); } - decltype(std::declval().crend()) cend() const { return base.crend(); } -private: - T &base; -}; - -template -reversed_container reversed(T &base) { - return reversed_container(base); -} - -template -static inline void default_new(T *&p) { p = new T(); } - -template -static inline void default_new(std::unique_ptr &p) { p.reset(new T()); } - -struct StringCmp { - using is_transparent = void; - bool operator()(std::string_view a, std::string_view b) const { return a < b; } -}; - -/* - * Bionic's atoi runs through strtol(). - * Use our own implementation for faster conversion. - */ -int parse_int(std::string_view s); - -std::list split_str(std::string_view s, std::string_view delimiter); - -std::string join_str(const std::list& list, std::string_view delimiter); - -template -static inline T align_to(T v, int a) { - static_assert(std::is_integral::value); - return (v + a - 1) / a * a; -} diff --git a/loader/src/include/socket_utils.h b/loader/src/include/socket_utils.h index 09330de..4c40559 100644 --- a/loader/src/include/socket_utils.h +++ b/loader/src/include/socket_utils.h @@ -1,31 +1,25 @@ -#pragma once +#ifndef SOCKET_UTILS_H +#define SOCKET_UTILS_H -#include -#include +#include -#include "logging.h" +int read_fd(int fd); + +char *read_string(int fd); -namespace socket_utils { +#define write_func_def(type) \ + ssize_t write_## type(int fd, type val) - ssize_t xread(int fd, void *buf, size_t count); +#define read_func_def(type) \ + ssize_t read_## type(int fd, type *val) - size_t xwrite(int fd, const void *buf, size_t count); +write_func_def(uint8_t); +read_func_def(uint8_t); - uint8_t read_u8(int fd); +write_func_def(uint32_t); +read_func_def(uint32_t); - uint32_t read_u32(int fd); +write_func_def(size_t); +read_func_def(size_t); - size_t read_usize(int fd); - - std::string read_string(int fd); - - bool write_u8(int fd, uint8_t val); - - bool write_u32(int fd, uint32_t val); - - int recv_fd(int fd); - - bool write_usize(int fd, size_t val); - - bool write_string(int fd, std::string_view str); -} +#endif /* SOCKET_UTILS_H */ \ No newline at end of file diff --git a/loader/src/injector/art_method.hpp b/loader/src/injector/art_method.hpp index 461d9dc..271e01a 100644 --- a/loader/src/injector/art_method.hpp +++ b/loader/src/injector/art_method.hpp @@ -1,5 +1,6 @@ #pragma once +#include "logging.h" #include "jni_helper.hpp" template diff --git a/loader/src/injector/entry.cpp b/loader/src/injector/entry.cpp index fabe209..dbbe379 100644 --- a/loader/src/injector/entry.cpp +++ b/loader/src/injector/entry.cpp @@ -12,10 +12,11 @@ void entry(void* addr, size_t size, const char* path) { LOGD("Zygisk library injected, version %s", ZKSU_VERSION); start_addr = addr; block_size = size; - zygiskd::Init(path); + rezygiskd_init(path); - if (!zygiskd::PingHeartbeat()) { + if (!rezygiskd_ping()) { LOGE("Zygisk daemon is not running"); + return; } diff --git a/loader/src/injector/hook.cpp b/loader/src/injector/hook.cpp index 6a63979..a37b542 100644 --- a/loader/src/injector/hook.cpp +++ b/loader/src/injector/hook.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include @@ -16,12 +17,12 @@ #include #include +#include #include "daemon.h" #include "zygisk.hpp" #include "module.hpp" -#include "files.hpp" -#include "misc.hpp" +#include "misc.h" #include "solist.h" @@ -121,7 +122,7 @@ struct ZygiskContext { // Global variables vector> *plt_hook_list; -map, StringCmp> *jni_hook_list; +map> *jni_hook_list; bool should_unmap_zygisk = false; std::vector cached_map_infos = {}; @@ -139,8 +140,8 @@ DCL_HOOK_FUNC(int, fork) { } bool update_mnt_ns(enum mount_namespace_state mns_state, bool dry_run) { - std::string ns_path = zygiskd::UpdateMountNamespace(mns_state); - if (ns_path.empty()) { + char ns_path[PATH_MAX]; + if (rezygiskd_update_mns(mns_state, ns_path, sizeof(ns_path)) == false) { PLOGE("Failed to update mount namespace"); return false; @@ -148,16 +149,16 @@ bool update_mnt_ns(enum mount_namespace_state mns_state, bool dry_run) { if (dry_run) return true; - int updated_ns = open(ns_path.data(), O_RDONLY); + int updated_ns = open(ns_path, O_RDONLY); if (updated_ns == -1) { - PLOGE("Failed to open mount namespace [%s]", ns_path.data()); + PLOGE("Failed to open mount namespace [%s]", ns_path); return false; } - LOGD("set mount namespace to [%s] fd=[%d]\n", ns_path.data(), updated_ns); + LOGD("set mount namespace to [%s] fd=[%d]\n", ns_path, updated_ns); if (setns(updated_ns, CLONE_NEWNS) == -1) { - PLOGE("Failed to set mount namespace [%s]", ns_path.data()); + PLOGE("Failed to set mount namespace [%s]", ns_path); close(updated_ns); return false; @@ -180,6 +181,8 @@ DCL_HOOK_FUNC(int, unshare, int flags) { update_mnt_ns(Rooted, false); } else if (!(g_ctx->flags[DO_REVERT_UNMOUNT])) { update_mnt_ns(Module, false); + } else { + LOGI("Process [%s] is on denylist, skipping unmount", g_ctx->process); } old_unshare(CLONE_NEWNS); @@ -389,8 +392,9 @@ void ZygiskContext::plt_hook_register(const char *regex, const char *symbol, voi regex_t re; if (regcomp(&re, regex, REG_NOSUB) != 0) return; - mutex_guard lock(hook_info_lock); + pthread_mutex_lock(&hook_info_lock); register_info.emplace_back(RegisterInfo{re, symbol, fn, backup}); + pthread_mutex_unlock(&hook_info_lock); } void ZygiskContext::plt_hook_exclude(const char *regex, const char *symbol) { @@ -398,8 +402,9 @@ void ZygiskContext::plt_hook_exclude(const char *regex, const char *symbol) { regex_t re; if (regcomp(&re, regex, REG_NOSUB) != 0) return; - mutex_guard lock(hook_info_lock); + pthread_mutex_lock(&hook_info_lock); ignore_info.emplace_back(IgnoreInfo{re, symbol ?: ""}); + pthread_mutex_unlock(&hook_info_lock); } void ZygiskContext::plt_hook_process_regex() { @@ -428,11 +433,13 @@ void ZygiskContext::plt_hook_process_regex() { bool ZygiskContext::plt_hook_commit() { { - mutex_guard lock(hook_info_lock); + pthread_mutex_lock(&hook_info_lock); plt_hook_process_regex(); register_info.clear(); ignore_info.clear(); + pthread_mutex_unlock(&hook_info_lock); } + return lsplt::CommitHook(cached_map_infos); } @@ -454,12 +461,12 @@ bool ZygiskModule::valid() const { /* Zygisksu changed: Use own zygiskd */ int ZygiskModule::connectCompanion() const { - return zygiskd::ConnectCompanion(id); + return rezygiskd_connect_companion(id); } /* Zygisksu changed: Use own zygiskd */ int ZygiskModule::getModuleDir() const { - return zygiskd::GetModuleDir(id); + return rezygiskd_get_module_dir(id); } void ZygiskModule::setOption(zygisk::Option opt) { @@ -596,21 +603,26 @@ void ZygiskContext::fork_post() { /* Zygisksu changed: Load module fds */ void ZygiskContext::run_modules_pre() { - auto ms = zygiskd::ReadModules(); - auto size = ms.size(); - for (size_t i = 0; i < size; i++) { - auto &m = ms[i]; + struct zygisk_modules ms; + if (rezygiskd_read_modules(&ms) == false) { + LOGE("Failed to read modules from zygiskd"); - void *handle = dlopen(m.path.c_str(), RTLD_NOW); + return; + } + + for (size_t i = 0; i < ms.modules_count; i++) { + char *lib_path = ms.modules[i]; + + void *handle = dlopen(lib_path, RTLD_NOW); if (!handle) { - LOGE("Failed to load module [%s]: %s", m.path.c_str(), dlerror()); + LOGE("Failed to load module [%s]: %s", lib_path, dlerror()); continue; } void *entry = dlsym(handle, "zygisk_module_entry"); if (!entry) { - LOGE("Failed to find entry point in module [%s]: %s", m.path.c_str(), dlerror()); + LOGE("Failed to find entry point in module [%s]: %s", lib_path, dlerror()); dlclose(handle); @@ -620,6 +632,8 @@ void ZygiskContext::run_modules_pre() { modules.emplace_back(i, handle, entry); } + free_modules(&ms); + for (auto &m : modules) { m.onLoad(env); if (flags[APP_SPECIALIZE]) m.preAppSpecialize(args.app); @@ -648,7 +662,7 @@ void ZygiskContext::run_modules_post() { void ZygiskContext::app_specialize_pre() { flags[APP_SPECIALIZE] = true; - info_flags = zygiskd::GetProcessFlags(g_ctx->args.app->uid); + info_flags = rezygiskd_get_process_flags(g_ctx->args.app->uid); if (info_flags & PROCESS_IS_FIRST_STARTED) { update_mnt_ns(Clean, true); } @@ -707,7 +721,7 @@ void ZygiskContext::nativeForkSystemServer_pre() { fork_pre(); if (is_child()) { run_modules_pre(); - zygiskd::SystemServerStarted(); + rezygiskd_system_server_started(); } sanitize_fds(); @@ -834,14 +848,11 @@ void clean_trace(const char* path, size_t load, size_t unload, bool spoof_maps) } void hook_functions() { - default_new(plt_hook_list); - default_new(jni_hook_list); + plt_hook_list = new vector>(); + jni_hook_list = new map>(); ino_t android_runtime_inode = 0; dev_t android_runtime_dev = 0; - /* TODO by ThePedroo: Implement injection via native bridge */ - // ino_t native_bridge_inode = 0; - // dev_t native_bridge_dev = 0; cached_map_infos = lsplt::MapInfo::Scan(); for (auto &map : cached_map_infos) { diff --git a/loader/src/include/solist.h b/loader/src/injector/solist.h similarity index 99% rename from loader/src/include/solist.h rename to loader/src/injector/solist.h index 906b56f..db726c1 100644 --- a/loader/src/include/solist.h +++ b/loader/src/injector/solist.h @@ -1,7 +1,6 @@ #ifndef SOLIST_H #define SOLIST_H -/* INFO: Temporary */ #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ diff --git a/loader/src/ptracer/main.cpp b/loader/src/ptracer/main.cpp index 3e833d6..9122f9c 100644 --- a/loader/src/ptracer/main.cpp +++ b/loader/src/ptracer/main.cpp @@ -5,7 +5,7 @@ #include "daemon.h" int main(int argc, char **argv) { - zygiskd::Init("/data/adb/rezygisk"); + rezygiskd_init("/data/adb/rezygisk"); printf("The ReZygisk Tracer %s\n\n", ZKSU_VERSION); @@ -16,7 +16,7 @@ int main(int argc, char **argv) { return 0; } else if (argc >= 3 && strcmp(argv[1], "trace") == 0) { - if (argc >= 4 && strcmp(argv[3], "--restart") == 0) zygiskd::ZygoteRestart(); + if (argc >= 4 && strcmp(argv[3], "--restart") == 0) rezygiskd_zygote_restart(); long pid = strtol(argv[2], 0, 0); if (!trace_zygote(pid)) { @@ -54,28 +54,28 @@ int main(int argc, char **argv) { return 0; } else if (argc >= 2 && strcmp(argv[1], "info") == 0) { - struct zygote_info info; - zygiskd::GetInfo(&info); + struct rezygisk_info info; + rezygiskd_get_info(&info); printf("Daemon process PID: %d\n", info.pid); switch (info.root_impl) { - case ZYGOTE_ROOT_IMPL_NONE: { + case ROOT_IMPL_NONE: { printf("Root implementation: none\n"); break; } - case ZYGOTE_ROOT_IMPL_APATCH: { + case ROOT_IMPL_APATCH: { printf("Root implementation: APatch\n"); - + break; } - case ZYGOTE_ROOT_IMPL_KERNELSU: { + case ROOT_IMPL_KERNELSU: { printf("Root implementation: KernelSU\n"); break; } - case ZYGOTE_ROOT_IMPL_MAGISK: { + case ROOT_IMPL_MAGISK: { printf("Root implementation: Magisk\n"); break; diff --git a/loader/src/ptracer/monitor.cpp b/loader/src/ptracer/monitor.cpp index af7f28c..5217ea5 100644 --- a/loader/src/ptracer/monitor.cpp +++ b/loader/src/ptracer/monitor.cpp @@ -14,8 +14,7 @@ #include "monitor.h" #include "utils.hpp" -#include "files.hpp" -#include "misc.hpp" +#include "misc.h" #define STOPPED_WITH(sig, event) WIFSTOPPED(status) && (status >> 8 == ((sig) | (event << 8))) @@ -140,7 +139,10 @@ struct SocketHandler : public EventHandler { .sun_path = { 0 } }; - size_t sun_path_len = sprintf(addr.sun_path, "%s/%s", zygiskd::GetTmpPath().c_str(), SOCKET_NAME); + char tmp_path[PATH_MAX]; + rezygiskd_get_path(tmp_path, sizeof(tmp_path)); + + size_t sun_path_len = sprintf(addr.sun_path, "%s/%s", tmp_path, SOCKET_NAME); socklen_t socklen = sizeof(sa_family_t) + sun_path_len; if (bind(sock_fd_, (struct sockaddr *)&addr, socklen) == -1) { @@ -747,7 +749,10 @@ static void updateStatus() { } static bool prepare_environment() { - strcat(prop_path, zygiskd::GetTmpPath().c_str()); + char tmp_path[PATH_MAX]; + rezygiskd_get_path(tmp_path, sizeof(tmp_path)); + + strcat(prop_path, tmp_path); strcat(prop_path, "/module.prop"); close(open(prop_path, O_WRONLY | O_CREAT | O_TRUNC, 0644)); @@ -817,7 +822,11 @@ int send_control_command(enum Command cmd) { .sun_path = { 0 } }; - size_t sun_path_len = snprintf(addr.sun_path, sizeof(addr.sun_path), "%s/%s", zygiskd::GetTmpPath().c_str(), SOCKET_NAME); + char tmp_path[PATH_MAX]; + rezygiskd_get_path(tmp_path, sizeof(tmp_path)); + + size_t sun_path_len = snprintf(addr.sun_path, sizeof(addr.sun_path), "%s/%s", tmp_path, SOCKET_NAME); + socklen_t socklen = sizeof(sa_family_t) + sun_path_len; ssize_t nsend = sendto(sockfd, (void *)&cmd, sizeof(cmd), 0, (sockaddr *)&addr, socklen); diff --git a/loader/src/ptracer/ptracer.cpp b/loader/src/ptracer/ptracer.cpp index f790f98..c8a7571 100644 --- a/loader/src/ptracer/ptracer.cpp +++ b/loader/src/ptracer/ptracer.cpp @@ -240,7 +240,11 @@ bool inject_on_main(int pid, const char *lib_path) { args.clear(); args.push_back((uintptr_t) start_addr); args.push_back(block_size); - str = push_string(pid, regs, zygiskd::GetTmpPath().c_str()); + + char tmp_path[PATH_MAX]; + rezygiskd_get_path(tmp_path, sizeof(tmp_path)); + + str = push_string(pid, regs, tmp_path); args.push_back((long) str); remote_call(pid, regs, injector_entry, (uintptr_t)libc_return_addr, args); @@ -287,10 +291,12 @@ bool trace_zygote(int pid) { if (STOPPED_WITH(SIGSTOP, PTRACE_EVENT_STOP)) { /* WARNING: C++ keyword */ - std::string lib_path = zygiskd::GetTmpPath(); - lib_path += "/lib" LP_SELECT("", "64") "/libzygisk.so"; + char lib_path[PATH_MAX]; + rezygiskd_get_path(lib_path, sizeof(lib_path)); - if (!inject_on_main(pid, lib_path.c_str())) { + strcat(lib_path,"/lib" LP_SELECT("", "64") "/libzygisk.so"); + + if (!inject_on_main(pid, lib_path)) { LOGE("failed to inject"); return false; From b94ea0c5f5ab3583bfca3c8a09d7e99fce830965 Mon Sep 17 00:00:00 2001 From: ThePedroo Date: Mon, 14 Apr 2025 19:32:49 -0300 Subject: [PATCH 37/46] improve: port ptracer to C This commit ports the C++ to C99 from zygisk-ptracer code, allowing a ~3x size reduce in its binary. --- loader/build.gradle.kts | 2 + loader/src/CMakeLists.txt | 5 +- loader/src/common/daemon.c | 31 +- loader/src/common/elf_util.c | 2 - loader/src/common/misc.c | 18 +- loader/src/include/daemon.h | 9 +- loader/src/include/native_bridge_callbacks.h | 33 - loader/src/injector/entry.cpp | 2 +- loader/src/injector/hook.cpp | 11 +- loader/src/injector/solist.c | 2 - loader/src/ptracer/{main.cpp => main.c} | 17 +- loader/src/ptracer/monitor.c | 892 ++++++++++++++++++ loader/src/ptracer/monitor.cpp | 838 ---------------- loader/src/ptracer/monitor.h | 10 +- loader/src/ptracer/{ptracer.cpp => ptracer.c} | 179 ++-- loader/src/ptracer/utils.c | 578 ++++++++++++ loader/src/ptracer/utils.cpp | 528 ----------- loader/src/ptracer/utils.h | 109 +++ loader/src/ptracer/utils.hpp | 125 --- zygiskd/src/utils.h | 2 +- zygiskd/src/zygiskd.c | 36 +- 21 files changed, 1739 insertions(+), 1690 deletions(-) delete mode 100644 loader/src/include/native_bridge_callbacks.h rename loader/src/ptracer/{main.cpp => main.c} (92%) create mode 100644 loader/src/ptracer/monitor.c delete mode 100644 loader/src/ptracer/monitor.cpp rename loader/src/ptracer/{ptracer.cpp => ptracer.c} (65%) create mode 100644 loader/src/ptracer/utils.c delete mode 100644 loader/src/ptracer/utils.cpp create mode 100644 loader/src/ptracer/utils.h delete mode 100644 loader/src/ptracer/utils.hpp diff --git a/loader/build.gradle.kts b/loader/build.gradle.kts index f9d9f8e..748350a 100644 --- a/loader/build.gradle.kts +++ b/loader/build.gradle.kts @@ -26,6 +26,8 @@ val ccachePath by lazy { } val defaultCFlags = arrayOf( + "-D_GNU_SOURCE", + "-Wall", "-Wextra", "-fno-rtti", "-fno-exceptions", "-fno-stack-protector", "-fomit-frame-pointer", diff --git a/loader/src/CMakeLists.txt b/loader/src/CMakeLists.txt index 84ba7b9..a0b60b5 100644 --- a/loader/src/CMakeLists.txt +++ b/loader/src/CMakeLists.txt @@ -10,7 +10,7 @@ add_definitions(-DZKSU_VERSION=\"${ZKSU_VERSION}\") aux_source_directory(common COMMON_SRC_LIST) add_library(common STATIC ${COMMON_SRC_LIST}) target_include_directories(common PRIVATE include) -target_link_libraries(common cxx::cxx log) +target_link_libraries(common log) aux_source_directory(injector INJECTOR_SRC_LIST) add_library(zygisk SHARED ${INJECTOR_SRC_LIST}) @@ -20,6 +20,5 @@ target_link_libraries(zygisk cxx::cxx log common lsplt_static phmap) aux_source_directory(ptracer PTRACER_SRC_LIST) add_executable(libzygisk_ptrace.so ${PTRACER_SRC_LIST}) target_include_directories(libzygisk_ptrace.so PRIVATE include) -target_link_libraries(libzygisk_ptrace.so cxx::cxx log common) - +target_link_libraries(libzygisk_ptrace.so log common) add_subdirectory(external) diff --git a/loader/src/common/daemon.c b/loader/src/common/daemon.c index 4a4b836..9910ef1 100644 --- a/loader/src/common/daemon.c +++ b/loader/src/common/daemon.c @@ -1,8 +1,3 @@ -// #include -// #include -// #include -// #include -// #include #include #include #include @@ -15,19 +10,6 @@ #include "daemon.h" -char daemon_path[PATH_MAX]; - -void rezygiskd_init(const char *path) { - snprintf(daemon_path, sizeof(daemon_path), "%s/%s", path, SOCKET_FILE_NAME); -} - -void rezygiskd_get_path(char *buf, size_t buf_size) { - size_t fileless_daemon_path = strlen(daemon_path) - strlen("/") - strlen(SOCKET_FILE_NAME); - - strncpy(buf, daemon_path, buf_size > fileless_daemon_path ? fileless_daemon_path : buf_size); - buf[fileless_daemon_path] = '\0'; -} - int rezygiskd_connect(uint8_t retry) { retry++; @@ -49,7 +31,7 @@ int rezygiskd_connect(uint8_t retry) { Sources: - https://pubs.opengroup.org/onlinepubs/009696699/basedefs/sys/un.h.html */ - strcpy(addr.sun_path, daemon_path); + strcpy(addr.sun_path, TMP_PATH "/" SOCKET_FILE_NAME); socklen_t socklen = sizeof(addr); while (--retry) { @@ -343,15 +325,18 @@ bool rezygiskd_update_mns(enum mount_namespace_state nms_state, char *buf, size_ write_uint8_t(fd, (uint8_t)nms_state); uint32_t target_pid = 0; - read_uint32_t(fd, &target_pid); - if (target_pid == 0) { + if (read_uint32_t(fd, &target_pid) < 0) { + PLOGE("Failed to read target pid"); + close(fd); return false; } - int target_fd = read_fd(fd); - if (target_fd == -1) { + uint32_t target_fd = 0; + if (read_uint32_t(fd, &target_fd) < 0) { + PLOGE("Failed to read target fd"); + close(fd); return false; diff --git a/loader/src/common/elf_util.c b/loader/src/common/elf_util.c index bfe89ba..bb4ee69 100644 --- a/loader/src/common/elf_util.c +++ b/loader/src/common/elf_util.c @@ -1,5 +1,3 @@ -/* INFO: This file is written in C99 */ - #include #include #include diff --git a/loader/src/common/misc.c b/loader/src/common/misc.c index 8d84de4..bf80144 100644 --- a/loader/src/common/misc.c +++ b/loader/src/common/misc.c @@ -1,14 +1,14 @@ int parse_int(const char *str) { - int val = 0; + int val = 0; - char *c = (char *)str; - while (*c) { - if (*c > '9' || *c < '0') - return -1; + char *c = (char *)str; + while (*c) { + if (*c > '9' || *c < '0') + return -1; - val = val * 10 + *c - '0'; - c++; - } + val = val * 10 + *c - '0'; + c++; + } - return val; + return val; } diff --git a/loader/src/include/daemon.h b/loader/src/include/daemon.h index 977eca5..c00dd7a 100644 --- a/loader/src/include/daemon.h +++ b/loader/src/include/daemon.h @@ -1,9 +1,12 @@ #ifndef DAEMON_H #define DAEMON_H + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ +#include + #include #ifdef __LP64__ @@ -51,9 +54,11 @@ enum mount_namespace_state { Module }; -void rezygiskd_init(const char *path); +#define TMP_PATH "/data/adb/rezygisk" -void rezygiskd_get_path(char *buf, size_t buf_size); +static inline const char *rezygiskd_get_path() { + return TMP_PATH; +} int rezygiskd_connect(uint8_t retry); diff --git a/loader/src/include/native_bridge_callbacks.h b/loader/src/include/native_bridge_callbacks.h deleted file mode 100644 index 60ff4be..0000000 --- a/loader/src/include/native_bridge_callbacks.h +++ /dev/null @@ -1,33 +0,0 @@ -#pragma once - -#include -#include - -template -struct NativeBridgeCallbacks; - -template<> -struct NativeBridgeCallbacks<__ANDROID_API_Q__> { - [[maybe_unused]] uint32_t version; - [[maybe_unused]] void *initialize; - [[maybe_unused]] void *loadLibrary; - [[maybe_unused]] void *getTrampoline; - [[maybe_unused]] void *isSupported; - [[maybe_unused]] void *getAppEnv; - [[maybe_unused]] void *isCompatibleWith; - [[maybe_unused]] void *getSignalHandler; - [[maybe_unused]] void *unloadLibrary; - [[maybe_unused]] void *getError; - [[maybe_unused]] void *isPathSupported; - [[maybe_unused]] void *initAnonymousNamespace; - [[maybe_unused]] void *createNamespace; - [[maybe_unused]] void *linkNamespaces; - [[maybe_unused]] void *loadLibraryExt; - [[maybe_unused]] void *getVendorNamespace; - [[maybe_unused]] void *getExportedNamespace; -}; - -template<> -struct NativeBridgeCallbacks<__ANDROID_API_R__> : NativeBridgeCallbacks<__ANDROID_API_Q__> { - [[maybe_unused]] void *preZygoteFork; -}; diff --git a/loader/src/injector/entry.cpp b/loader/src/injector/entry.cpp index dbbe379..543a374 100644 --- a/loader/src/injector/entry.cpp +++ b/loader/src/injector/entry.cpp @@ -10,9 +10,9 @@ size_t block_size = 0; extern "C" [[gnu::visibility("default")]] void entry(void* addr, size_t size, const char* path) { LOGD("Zygisk library injected, version %s", ZKSU_VERSION); + start_addr = addr; block_size = size; - rezygiskd_init(path); if (!rezygiskd_ping()) { LOGE("Zygisk daemon is not running"); diff --git a/loader/src/injector/hook.cpp b/loader/src/injector/hook.cpp index a37b542..c50af31 100644 --- a/loader/src/injector/hook.cpp +++ b/loader/src/injector/hook.cpp @@ -181,8 +181,6 @@ DCL_HOOK_FUNC(int, unshare, int flags) { update_mnt_ns(Rooted, false); } else if (!(g_ctx->flags[DO_REVERT_UNMOUNT])) { update_mnt_ns(Module, false); - } else { - LOGI("Process [%s] is on denylist, skipping unmount", g_ctx->process); } old_unshare(CLONE_NEWNS); @@ -636,6 +634,7 @@ void ZygiskContext::run_modules_pre() { for (auto &m : modules) { m.onLoad(env); + if (flags[APP_SPECIALIZE]) m.preAppSpecialize(args.app); else if (flags[SERVER_FORK_AND_SPECIALIZE]) m.preServerSpecialize(args.server); } @@ -674,6 +673,12 @@ void ZygiskContext::app_specialize_pre() { if ((info_flags & (PROCESS_IS_MANAGER | PROCESS_ROOT_IS_MAGISK)) == (PROCESS_IS_MANAGER | PROCESS_ROOT_IS_MAGISK)) { LOGD("Manager process detected. Notifying that Zygisk has been enabled."); + /* INFO: This environment variable is related to Magisk Zygisk/Manager. It + it used by Magisk's Zygisk to communicate to Magisk Manager whether + Zygisk is working or not. + + To allow Zygisk modules to both work properly and for the manager to + identify Zygisk, being it not built-in, as working, we also set it. */ setenv("ZYGISK_ENABLED", "1", 1); } else { run_modules_pre(); @@ -818,7 +823,7 @@ void clean_trace(const char* path, size_t load, size_t unload, bool spoof_maps) if (load > 0 || unload > 0) solist_reset_counters(load, unload); - LOGI("Dropping solist record for %s", path); + LOGD("Dropping solist record for %s", path); bool path_found = solist_drop_so_path(path); if (!path_found || !spoof_maps) return; diff --git a/loader/src/injector/solist.c b/loader/src/injector/solist.c index b338938..1e460a8 100644 --- a/loader/src/injector/solist.c +++ b/loader/src/injector/solist.c @@ -1,5 +1,3 @@ -/* INFO: This file is written in C99 */ - #include #include #include diff --git a/loader/src/ptracer/main.cpp b/loader/src/ptracer/main.c similarity index 92% rename from loader/src/ptracer/main.cpp rename to loader/src/ptracer/main.c index 9122f9c..2b76131 100644 --- a/loader/src/ptracer/main.cpp +++ b/loader/src/ptracer/main.c @@ -1,19 +1,22 @@ #include +#include + +#ifdef __LP64__ + #define LOG_TAG "zygisk-ptrace64" +#else + #define LOG_TAG "zygisk-ptrace32" +#endif #include "monitor.h" -#include "utils.hpp" +#include "utils.h" #include "daemon.h" int main(int argc, char **argv) { - rezygiskd_init("/data/adb/rezygisk"); - printf("The ReZygisk Tracer %s\n\n", ZKSU_VERSION); if (argc >= 2 && strcmp(argv[1], "monitor") == 0) { init_monitor(); - printf("[ReZygisk]: Started monitoring...\n"); - return 0; } else if (argc >= 3 && strcmp(argv[1], "trace") == 0) { if (argc >= 4 && strcmp(argv[3], "--restart") == 0) rezygiskd_zygote_restart(); @@ -25,11 +28,9 @@ int main(int argc, char **argv) { return 1; } - printf("[ReZygisk]: Tracing %ld...\n", pid); - return 0; } else if (argc >= 2 && strcmp(argv[1], "ctl") == 0) { - enum Command command; + enum rezygiskd_command command; if (strcmp(argv[2], "start") == 0) command = START; else if (strcmp(argv[2], "stop") == 0) command = STOP; diff --git a/loader/src/ptracer/monitor.c b/loader/src/ptracer/monitor.c new file mode 100644 index 0000000..8188e84 --- /dev/null +++ b/loader/src/ptracer/monitor.c @@ -0,0 +1,892 @@ +#include + +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include "daemon.h" +#include "utils.h" +#include "misc.h" + +#include "monitor.h" + +#define PROP_PATH TMP_PATH "/module.prop" +#define SOCKET_NAME "init_monitor" + +#define STOPPED_WITH(sig, event) WIFSTOPPED(sigchld_status) && (sigchld_status >> 8 == ((sig) | (event << 8))) + +static bool update_status(const char *message); + +char monitor_stop_reason[32]; + +enum ptracer_tracing_state { + TRACING, + STOPPING, + STOPPED, + EXITING +}; + +enum ptracer_tracing_state tracing_state = TRACING; + +struct rezygiskd_status { + bool supported; + bool zygote_injected; + bool daemon_running; + pid_t daemon_pid; + char *daemon_info; + char *daemon_error_info; +}; + +struct rezygiskd_status status64 = { + .daemon_pid = -1 +}; +struct rezygiskd_status status32 = { + .daemon_pid = -1 +}; + +int monitor_epoll_fd; +bool monitor_events_running = true; + +bool monitor_events_init() { + monitor_epoll_fd = epoll_create(1); + if (monitor_epoll_fd == -1) { + PLOGE("epoll_create"); + + return false; + } + + return true; +} + +struct monitor_event_cbs { + void (*callback)(); + void (*stop_callback)(); +}; + +bool monitor_events_register_event(struct monitor_event_cbs *event_cbs, int fd, uint32_t events) { + struct epoll_event ev = { + .data.ptr = event_cbs, + .events = events + }; + + if (epoll_ctl(monitor_epoll_fd, EPOLL_CTL_ADD, fd, &ev) == -1) { + PLOGE("epoll_ctl"); + + return false; + } + + return true; +} + +bool monitor_events_unregister_event(int fd) { + if (epoll_ctl(monitor_epoll_fd, EPOLL_CTL_DEL, fd, NULL) == -1) { + PLOGE("epoll_ctl"); + + return false; + } + + return true; +} + +void monitor_events_stop() { + monitor_events_running = false; +}; + +void monitor_events_loop() { + struct epoll_event events[2]; + while (monitor_events_running) { + int nfds = epoll_wait(monitor_epoll_fd, events, 2, -1); + if (nfds == -1) { + if (errno != EINTR) PLOGE("epoll_wait"); + + continue; + } + + for (int i = 0; i < nfds; i++) { + struct monitor_event_cbs *event_cbs = (struct monitor_event_cbs *)events[i].data.ptr; + event_cbs->callback(); + + if (!monitor_events_running) break; + } + } + + if (monitor_epoll_fd >= 0) close(monitor_epoll_fd); + monitor_epoll_fd = -1; + + for (int i = 0; i < (int)(sizeof(events) / sizeof(events[0])); i++) { + struct monitor_event_cbs *event_cbs = (struct monitor_event_cbs *)events[i].data.ptr; + event_cbs->stop_callback(); + } +} + +int monitor_sock_fd; + +bool rezygiskd_listener_init() { + monitor_sock_fd = socket(PF_UNIX, SOCK_DGRAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0); + if (monitor_sock_fd == -1) { + PLOGE("socket create"); + + return false; + } + + struct sockaddr_un addr = { + .sun_family = AF_UNIX, + .sun_path = { 0 } + }; + + size_t sun_path_len = sprintf(addr.sun_path, "%s/%s", rezygiskd_get_path(), SOCKET_NAME); + + socklen_t socklen = sizeof(sa_family_t) + sun_path_len; + if (bind(monitor_sock_fd, (struct sockaddr *)&addr, socklen) == -1) { + PLOGE("bind socket"); + + return false; + } + + return true; +} + +void rezygiskd_listener_callback() { + struct [[gnu::packed]] MsgHead { + enum rezygiskd_command cmd; + int length; + char data[0]; + }; + + while (1) { + struct MsgHead *msg = (struct MsgHead *)malloc(sizeof(struct MsgHead)); + + ssize_t real_size; + ssize_t nread = recv(monitor_sock_fd, msg, sizeof(struct MsgHead), MSG_PEEK); + if (nread == -1) { + if (errno == EAGAIN) break; + + PLOGE("read socket"); + } + + if ((size_t)nread < sizeof(enum rezygiskd_command)) { + LOGE("read %zu < %zu", nread, sizeof(enum rezygiskd_command)); + continue; + } + + if (msg->cmd >= DAEMON64_SET_INFO && msg->cmd != SYSTEM_SERVER_STARTED) { + if (nread != sizeof(msg)) { + LOGE("cmd %d size %zu != %zu", msg->cmd, nread, sizeof(struct MsgHead)); + + continue; + } + + real_size = sizeof(struct MsgHead) + msg->length; + } else { + if (nread != sizeof(enum rezygiskd_command)) { + LOGE("cmd %d size %zu != %zu", msg->cmd, nread, sizeof(enum rezygiskd_command)); + + continue; + } + + real_size = sizeof(enum rezygiskd_command); + } + + msg = (struct MsgHead *)realloc(msg, real_size); + nread = recv(monitor_sock_fd, msg, real_size, 0); + + if (nread == -1) { + if (errno == EAGAIN) break; + + PLOGE("recv"); + continue; + } + + if (nread != real_size) { + LOGE("real size %zu != %zu", real_size, nread); + + continue; + } + + switch (msg->cmd) { + case START: { + if (tracing_state == STOPPING) tracing_state = TRACING; + else if (tracing_state == STOPPED) { + ptrace(PTRACE_SEIZE, 1, 0, PTRACE_O_TRACEFORK); + + LOGI("start tracing init"); + + tracing_state = TRACING; + } + + update_status(NULL); + + break; + } + case STOP: { + if (tracing_state == TRACING) { + LOGI("stop tracing requested"); + + tracing_state = STOPPING; + strcpy(monitor_stop_reason, "user requested"); + + ptrace(PTRACE_INTERRUPT, 1, 0, 0); + update_status(NULL); + } + + break; + } + case EXIT: { + LOGI("prepare for exit ..."); + + tracing_state = EXITING; + strcpy(monitor_stop_reason, "user requested"); + + update_status(NULL); + monitor_events_stop(); + + break; + } + case ZYGOTE64_INJECTED: { + status64.zygote_injected = true; + + update_status(NULL); + + break; + } + case ZYGOTE32_INJECTED: { + status32.zygote_injected = true; + + update_status(NULL); + + break; + } + case DAEMON64_SET_INFO: { + LOGD("received daemon64 info %s", msg->data); + + /* Will only happen if somehow the daemon restarts */ + if (status64.daemon_info) { + free(status64.daemon_info); + status64.daemon_info = NULL; + } + + status64.daemon_info = (char *)malloc(msg->length); + if (!status64.daemon_info) { + PLOGE("malloc daemon64 info"); + + break; + } + + strcpy(status64.daemon_info, msg->data); + + update_status(NULL); + + break; + } + case DAEMON32_SET_INFO: { + LOGD("received daemon32 info %s", msg->data); + + if (status32.daemon_info) { + free(status32.daemon_info); + status32.daemon_info = NULL; + } + + status32.daemon_info = (char *)malloc(msg->length); + if (!status32.daemon_info) { + PLOGE("malloc daemon32 info"); + + break; + } + + strcpy(status32.daemon_info, msg->data); + + update_status(NULL); + + break; + } + case DAEMON64_SET_ERROR_INFO: { + LOGD("received daemon64 error info %s", msg->data); + + status64.daemon_running = false; + + if (status64.daemon_error_info) { + free(status64.daemon_error_info); + status64.daemon_error_info = NULL; + } + + status64.daemon_error_info = (char *)malloc(msg->length); + if (!status64.daemon_error_info) { + PLOGE("malloc daemon64 error info"); + + break; + } + + strcpy(status64.daemon_error_info, msg->data); + + update_status(NULL); + + break; + } + case DAEMON32_SET_ERROR_INFO: { + LOGD("received daemon32 error info %s", msg->data); + + status32.daemon_running = false; + + if (status32.daemon_error_info) { + free(status32.daemon_error_info); + status32.daemon_error_info = NULL; + } + + status32.daemon_error_info = (char *)malloc(msg->length); + if (!status32.daemon_error_info) { + PLOGE("malloc daemon32 error info"); + + break; + } + + strcpy(status32.daemon_error_info, msg->data); + + update_status(NULL); + + break; + } + case SYSTEM_SERVER_STARTED: { + LOGD("system server started, mounting prop"); + + if (mount(PROP_PATH, "/data/adb/modules/zygisksu/module.prop", NULL, MS_BIND, NULL) == -1) { + PLOGE("failed to mount prop"); + } + + break; + } + } + + free(msg); + } +} + +void rezygiskd_listener_stop() { + if (monitor_sock_fd >= 0) close(monitor_sock_fd); + monitor_sock_fd = -1; +} + +#define MAX_RETRY_COUNT 5 + +#define CREATE_ZYGOTE_START_COUNTER(abi) \ + struct timespec last_zygote##abi = { \ + .tv_sec = 0, \ + .tv_nsec = 0 \ + }; \ + \ + int count_zygote ## abi = 0; \ + bool should_stop_inject ## abi() { \ + struct timespec now = {}; \ + clock_gettime(CLOCK_MONOTONIC, &now); \ + if (now.tv_sec - last_zygote ## abi.tv_sec < 30) \ + count_zygote ## abi++; \ + else \ + count_zygote ## abi = 0; \ + \ + last_zygote##abi = now; \ + \ + return count_zygote##abi >= MAX_RETRY_COUNT; \ + } + +CREATE_ZYGOTE_START_COUNTER(64) +CREATE_ZYGOTE_START_COUNTER(32) + +static bool ensure_daemon_created(bool is_64bit) { + struct rezygiskd_status *status = is_64bit ? &status64 : &status32; + if (is_64bit) { + LOGD("new zygote started."); + + umount2("/data/adb/modules/zygisksu/module.prop", MNT_DETACH); + } + + status->zygote_injected = false; + + if (status->daemon_pid == -1) { + pid_t pid = fork(); + if (pid < 0) { + PLOGE("create daemon%s", is_64bit ? "64" : "32"); + + return false; + } else if (pid == 0) { + char daemon_name[PATH_MAX] = "./bin/zygiskd"; + strcat(daemon_name, is_64bit ? "64" : "32"); + + execl(daemon_name, daemon_name, NULL); + + PLOGE("exec daemon %s failed", daemon_name); + + exit(1); + } else { + status->supported = true; + status->daemon_pid = pid; + status->daemon_running = true; + + return true; + } + } else { + return status->daemon_running; + } +} + +#define CHECK_DAEMON_EXIT(abi) \ + if (status##abi.supported && pid == status##abi.daemon_pid) { \ + char status_str[64]; \ + parse_status(sigchld_status, status_str, sizeof(status_str)); \ + \ + LOGW("daemon" #abi " pid %d exited: %s", pid, status_str); \ + status##abi.daemon_running = false; \ + \ + if (!status##abi.daemon_error_info) { \ + status##abi.daemon_error_info = (char *)malloc(strlen(status_str) + 1); \ + if (!status##abi.daemon_error_info) { \ + LOGE("malloc daemon" #abi " error info failed"); \ + \ + return; \ + } \ + \ + memcpy(status##abi.daemon_error_info, status_str, strlen(status_str) + 1); \ + } \ + \ + update_status(NULL); \ + continue; \ + } + +#define PRE_INJECT(abi, is_64) \ + if (strcmp(program, "/system/bin/app_process" # abi) == 0) { \ + tracer = "./bin/zygisk-ptrace" # abi; \ + \ + if (should_stop_inject ## abi()) { \ + LOGW("zygote" # abi " restart too much times, stop injecting"); \ + \ + tracing_state = STOPPING; \ + memcpy(monitor_stop_reason, "zygote crashed", sizeof("zygote crashed")); \ + ptrace(PTRACE_INTERRUPT, 1, 0, 0); \ + \ + break; \ + } \ + if (!ensure_daemon_created(is_64)) { \ + LOGW("daemon" #abi " not running, stop injecting"); \ + \ + tracing_state = STOPPING; \ + memcpy(monitor_stop_reason, "daemon not running", sizeof("daemon not running")); \ + ptrace(PTRACE_INTERRUPT, 1, 0, 0); \ + \ + break; \ + } \ + } + +int sigchld_signal_fd; +struct signalfd_siginfo sigchld_fdsi; +int sigchld_status; + +pid_t *sigchld_process; +size_t sigchld_process_count = 0; + +bool sigchld_listener_init() { + sigchld_process = NULL; + + sigset_t mask; + sigemptyset(&mask); + sigaddset(&mask, SIGCHLD); + + if (sigprocmask(SIG_BLOCK, &mask, NULL) == -1) { + PLOGE("set sigprocmask"); + + return false; + } + + sigchld_signal_fd = signalfd(-1, &mask, SFD_NONBLOCK | SFD_CLOEXEC); + if (sigchld_signal_fd == -1) { + PLOGE("create signalfd"); + + return false; + } + + ptrace(PTRACE_SEIZE, 1, 0, PTRACE_O_TRACEFORK); + + return true; +} + +void sigchld_listener_callback() { + while (1) { + ssize_t s = read(sigchld_signal_fd, &sigchld_fdsi, sizeof(sigchld_fdsi)); + if (s == -1) { + if (errno == EAGAIN) break; + + PLOGE("read signalfd"); + + continue; + } + + if (s != sizeof(sigchld_fdsi)) { + LOGW("read %zu != %zu", s, sizeof(sigchld_fdsi)); + + continue; + } + + if (sigchld_fdsi.ssi_signo != SIGCHLD) { + LOGW("no sigchld received"); + + continue; + } + + int pid; + while ((pid = waitpid(-1, &sigchld_status, __WALL | WNOHANG)) != 0) { + if (pid == -1) { + if (tracing_state == STOPPED && errno == ECHILD) break; + PLOGE("waitpid"); + } + + if (pid == 1) { + if (STOPPED_WITH(SIGTRAP, PTRACE_EVENT_FORK)) { + long child_pid; + + ptrace(PTRACE_GETEVENTMSG, pid, 0, &child_pid); + + LOGV("forked %ld", child_pid); + } else if (STOPPED_WITH(SIGTRAP, PTRACE_EVENT_STOP) && tracing_state == STOPPING) { + if (ptrace(PTRACE_DETACH, 1, 0, 0) == -1) PLOGE("failed to detach init"); + + tracing_state = STOPPED; + + LOGI("stop tracing init"); + + continue; + } + + if (WIFSTOPPED(sigchld_status)) { + if (WPTEVENT(sigchld_status) == 0) { + if (WSTOPSIG(sigchld_status) != SIGSTOP && WSTOPSIG(sigchld_status) != SIGTSTP && WSTOPSIG(sigchld_status) != SIGTTIN && WSTOPSIG(sigchld_status) != SIGTTOU) { + LOGW("inject signal sent to init: %s %d", sigabbrev_np(WSTOPSIG(sigchld_status)), WSTOPSIG(sigchld_status)); + + ptrace(PTRACE_CONT, pid, 0, WSTOPSIG(sigchld_status)); + + continue; + } else { + LOGW("suppress stopping signal sent to init: %s %d", sigabbrev_np(WSTOPSIG(sigchld_status)), WSTOPSIG(sigchld_status)); + } + } + + ptrace(PTRACE_CONT, pid, 0, 0); + } + + continue; + } + + CHECK_DAEMON_EXIT(64) + CHECK_DAEMON_EXIT(32) + + pid_t state = 0; + for (size_t i = 0; i < sigchld_process_count; i++) { + if (sigchld_process[i] != pid) continue; + + state = sigchld_process[i]; + + break; + } + + if (state == 0) { + LOGV("new process %d attached", pid); + + for (size_t i = 0; i < sigchld_process_count; i++) { + if (sigchld_process[i] != 0) continue; + + sigchld_process[i] = pid; + + goto ptrace_process; + } + + sigchld_process = (pid_t *)realloc(sigchld_process, sizeof(pid_t) * (sigchld_process_count + 1)); + if (sigchld_process == NULL) { + PLOGE("realloc sigchld_process"); + + continue; + } + + sigchld_process[sigchld_process_count] = pid; + sigchld_process_count++; + + ptrace_process: + + ptrace(PTRACE_SETOPTIONS, pid, 0, PTRACE_O_TRACEEXEC); + ptrace(PTRACE_CONT, pid, 0, 0); + + continue; + } else { + if (STOPPED_WITH(SIGTRAP, PTRACE_EVENT_EXEC)) { + char program[PATH_MAX]; + if (get_program(pid, program, sizeof(program)) == -1) { + LOGW("failed to get program %d", pid); + + continue; + } + + LOGV("%d program %s", pid, program); + const char* tracer = NULL; + + do { + if (tracing_state != TRACING) { + LOGW("stop injecting %d because not tracing", pid); + + break; + } + + PRE_INJECT(64, true) + PRE_INJECT(32, false) + + if (tracer != NULL) { + LOGD("stopping %d", pid); + + kill(pid, SIGSTOP); + ptrace(PTRACE_CONT, pid, 0, 0); + waitpid(pid, &sigchld_status, __WALL); + + if (STOPPED_WITH(SIGSTOP, 0)) { + LOGD("detaching %d", pid); + + ptrace(PTRACE_DETACH, pid, 0, SIGSTOP); + sigchld_status = 0; + int p = fork_dont_care(); + + if (p == 0) { + char pid_str[32]; + sprintf(pid_str, "%d", pid); + + execl(tracer, basename(tracer), "trace", pid_str, "--restart", NULL); + + PLOGE("failed to exec, kill"); + + kill(pid, SIGKILL); + exit(1); + } else if (p == -1) { + PLOGE("failed to fork, kill"); + + kill(pid, SIGKILL); + } + } + } + } while (false); + + update_status(NULL); + } else { + char status_str[64]; + parse_status(sigchld_status, status_str, sizeof(status_str)); + + LOGW("process %d received unknown sigchld_status %s", pid, status_str); + } + + for (size_t i = 0; i < sigchld_process_count; i++) { + if (sigchld_process[i] != pid) continue; + + sigchld_process[i] = 0; + + break; + } + + if (WIFSTOPPED(sigchld_status)) { + LOGV("detach process %d", pid); + + ptrace(PTRACE_DETACH, pid, 0, 0); + } + } + } + } +} + +void sigchld_listener_stop() { + if (sigchld_signal_fd >= 0) close(sigchld_signal_fd); + sigchld_signal_fd = -1; + + if (sigchld_process != NULL) free(sigchld_process); + sigchld_process = NULL; + sigchld_process_count = 0; +} + +static char pre_section[1024]; +static char post_section[1024]; + +#define WRITE_STATUS_ABI(suffix) \ + if (status ## suffix.supported) { \ + strcat(status_text, " zygote" # suffix ": "); \ + if (tracing_state != TRACING) strcat(status_text, "❓ unknown, "); \ + else if (status ## suffix.zygote_injected) strcat(status_text, "😋 injected, "); \ + else strcat(status_text, "❌ not injected, "); \ + \ + strcat(status_text, "daemon" # suffix ": "); \ + if (status ## suffix.daemon_running) { \ + strcat(status_text, "😋 running "); \ + \ + if (status ## suffix.daemon_info != NULL) { \ + strcat(status_text, "("); \ + strcat(status_text, status ## suffix.daemon_info); \ + strcat(status_text, ")"); \ + } \ + } else { \ + strcat(status_text, "❌ crashed "); \ + \ + if (status ## suffix.daemon_error_info != NULL) { \ + strcat(status_text, "("); \ + strcat(status_text, status ## suffix.daemon_error_info); \ + strcat(status_text, ")"); \ + } \ + } \ + } + +static bool update_status(const char *message) { + FILE *prop = fopen(PROP_PATH, "w"); + if (prop == NULL) { + PLOGE("failed to open prop"); + + return false; + } + + if (message) { + fprintf(prop, "%s[%s] %s", pre_section, message, post_section); + fclose(prop); + + return true; + } + + char status_text[1024] = "monitor: "; + + switch (tracing_state) { + case TRACING: { + strcat(status_text, "😋 tracing"); + + break; + } + case STOPPING: [[fallthrough]]; + case STOPPED: { + strcat(status_text, "❌ stopped"); + + break; + } + case EXITING: { + strcat(status_text, "❌ exited"); + + break; + } + } + + if (tracing_state != TRACING && monitor_stop_reason[0] != '\0') { + strcat(status_text, " ("); + strcat(status_text, monitor_stop_reason); + strcat(status_text, ")"); + } + strcat(status_text, ","); + + WRITE_STATUS_ABI(64) + WRITE_STATUS_ABI(32) + + fprintf(prop, "%s[%s] %s", pre_section, status_text, post_section); + + fclose(prop); + + return true; +} + +static bool prepare_environment() { + /* INFO: We need to create the file first, otherwise the mount will fail */ + close(open(PROP_PATH, O_WRONLY | O_CREAT | O_TRUNC, 0644)); + + FILE *orig_prop = fopen("/data/adb/modules/zygisksu/module.prop", "r"); + if (orig_prop == NULL) { + PLOGE("failed to open orig prop"); + + return false; + } + + bool after_description = false; + + char line[1024]; + while (fgets(line, sizeof(line), orig_prop) != NULL) { + if (strncmp(line, "description=", strlen("description=")) == 0) { + strcat(pre_section, "description="); + strcat(post_section, line + strlen("description=")); + after_description = true; + + continue; + } + + if (after_description) strcat(post_section, line); + else strcat(pre_section, line); + } + + fclose(orig_prop); + + /* INFO: This environment variable is related to Magisk Zygisk/Manager. It + it used by Magisk's Zygisk to communicate to Magisk Manager whether + Zygisk is working or not. + + Because of that behavior, we can knowledge built-in Zygisk is being + used and stop the continuation of initialization of ReZygisk.*/ + if (getenv("ZYGISK_ENABLED")) { + update_status("❌ Disable Magisk's built-in Zygisk"); + + return false; + } + + return update_status(NULL); +} + +void init_monitor() { + LOGI("ReZygisk %s", ZKSU_VERSION); + + if (!prepare_environment()) exit(1); + + monitor_events_init(); + + rezygiskd_listener_init(); + + struct monitor_event_cbs listener_cbs = { + .callback = rezygiskd_listener_callback, + .stop_callback = rezygiskd_listener_stop + }; + monitor_events_register_event(&listener_cbs, monitor_sock_fd, EPOLLIN | EPOLLET); + + sigchld_listener_init(); + + struct monitor_event_cbs sigchld_cbs = { + .callback = sigchld_listener_callback, + .stop_callback = sigchld_listener_stop + }; + monitor_events_register_event(&sigchld_cbs, sigchld_signal_fd, EPOLLIN | EPOLLET); + + monitor_events_loop(); + + if (status64.daemon_info) free(status64.daemon_info); + if (status64.daemon_error_info) free(status64.daemon_error_info); + if (status32.daemon_info) free(status32.daemon_info); + if (status32.daemon_error_info) free(status32.daemon_error_info); + + LOGI("exit"); +} + +int send_control_command(enum rezygiskd_command cmd) { + int sockfd = socket(PF_UNIX, SOCK_DGRAM | SOCK_CLOEXEC, 0); + if (sockfd == -1) return -1; + + struct sockaddr_un addr = { + .sun_family = AF_UNIX, + .sun_path = { 0 } + }; + + size_t sun_path_len = snprintf(addr.sun_path, sizeof(addr.sun_path), "%s/%s", rezygiskd_get_path(), SOCKET_NAME); + + socklen_t socklen = sizeof(sa_family_t) + sun_path_len; + + ssize_t nsend = sendto(sockfd, (void *)&cmd, sizeof(cmd), 0, (struct sockaddr *)&addr, socklen); + + close(sockfd); + + return nsend != sizeof(cmd) ? -1 : 0; +} diff --git a/loader/src/ptracer/monitor.cpp b/loader/src/ptracer/monitor.cpp deleted file mode 100644 index 5217ea5..0000000 --- a/loader/src/ptracer/monitor.cpp +++ /dev/null @@ -1,838 +0,0 @@ -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "monitor.h" -#include "utils.hpp" -#include "misc.h" - -#define STOPPED_WITH(sig, event) WIFSTOPPED(status) && (status >> 8 == ((sig) | (event << 8))) - -static void updateStatus(); - -char monitor_stop_reason[32]; - -constexpr char SOCKET_NAME[] = "init_monitor"; - -struct EventLoop; - -struct EventHandler { - virtual int GetFd() = 0; - virtual void HandleEvent(EventLoop& loop, uint32_t event) = 0; -}; - -struct EventLoop { - private: - int epoll_fd_; - bool running = false; - public: - bool Init() { - epoll_fd_ = epoll_create(1); - if (epoll_fd_ == -1) { - PLOGE("failed to create"); - - return false; - } - - return true; - } - - void Stop() { - running = false; - } - - void Loop() { - running = true; - - constexpr auto MAX_EVENTS = 2; - struct epoll_event events[MAX_EVENTS]; - - while (running) { - int nfds = epoll_wait(epoll_fd_, events, MAX_EVENTS, -1); - if (nfds == -1) { - if (errno != EINTR) PLOGE("epoll_wait"); - - continue; - } - - for (int i = 0; i < nfds; i++) { - reinterpret_cast(events[i].data.ptr)->HandleEvent(*this, - events[i].events); - if (!running) break; - } - } - } - - bool RegisterHandler(EventHandler &handler, uint32_t events) { - struct epoll_event ev{}; - ev.events = events; - ev.data.ptr = &handler; - if (epoll_ctl(epoll_fd_, EPOLL_CTL_ADD, handler.GetFd(), &ev) == -1) { - PLOGE("failed to add event handler"); - - return false; - } - - return true; - } - - bool UnregisterHandler(EventHandler &handler) { - if (epoll_ctl(epoll_fd_, EPOLL_CTL_DEL, handler.GetFd(), NULL) == -1) { - PLOGE("failed to del event handler"); - - return false; - } - - return true; - } - - ~EventLoop() { - if (epoll_fd_ >= 0) close(epoll_fd_); - } -}; - -enum TracingState { - TRACING = 1, - STOPPING, - STOPPED, - EXITING -}; - -TracingState tracing_state = TRACING; -static char prop_path[PATH_MAX]; - -struct Status { - bool supported = false; - bool zygote_injected = false; - bool daemon_running = false; - pid_t daemon_pid = -1; - char *daemon_info = NULL; - char *daemon_error_info = NULL; -}; - -Status status64; -Status status32; - -struct SocketHandler : public EventHandler { - int sock_fd_; - - bool Init() { - sock_fd_ = socket(PF_UNIX, SOCK_DGRAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0); - if (sock_fd_ == -1) { - PLOGE("socket create"); - - return false; - } - - struct sockaddr_un addr = { - .sun_family = AF_UNIX, - .sun_path = { 0 } - }; - - char tmp_path[PATH_MAX]; - rezygiskd_get_path(tmp_path, sizeof(tmp_path)); - - size_t sun_path_len = sprintf(addr.sun_path, "%s/%s", tmp_path, SOCKET_NAME); - - socklen_t socklen = sizeof(sa_family_t) + sun_path_len; - if (bind(sock_fd_, (struct sockaddr *)&addr, socklen) == -1) { - PLOGE("bind socket"); - - return false; - } - - return true; - } - - int GetFd() override { - return sock_fd_; - } - - void HandleEvent(EventLoop &loop, uint32_t) override { - struct [[gnu::packed]] MsgHead { - enum Command cmd; - int length; - char data[0]; - }; - - while (1) { - struct MsgHead *msg = (struct MsgHead *)malloc(sizeof(struct MsgHead)); - - ssize_t real_size; - ssize_t nread = recv(sock_fd_, msg, sizeof(struct MsgHead), MSG_PEEK); - if (nread == -1) { - if (errno == EAGAIN) break; - - PLOGE("read socket"); - } - - if ((size_t)nread < sizeof(Command)) { - LOGE("read %zu < %zu", nread, sizeof(Command)); - continue; - } - - if (msg->cmd >= Command::DAEMON64_SET_INFO && msg->cmd != Command::SYSTEM_SERVER_STARTED) { - if (nread != sizeof(msg)) { - LOGE("cmd %d size %zu != %zu", msg->cmd, nread, sizeof(MsgHead)); - - continue; - } - - real_size = sizeof(MsgHead) + msg->length; - } else { - if (nread != sizeof(Command)) { - LOGE("cmd %d size %zu != %zu", msg->cmd, nread, sizeof(Command)); - - continue; - } - - real_size = sizeof(Command); - } - - msg = (struct MsgHead *)realloc(msg, real_size); - nread = recv(sock_fd_, msg, real_size, 0); - - if (nread == -1) { - if (errno == EAGAIN) break; - - PLOGE("recv"); - continue; - } - - if (nread != real_size) { - LOGE("real size %zu != %zu", real_size, nread); - - continue; - } - - switch (msg->cmd) { - case START: { - if (tracing_state == STOPPING) tracing_state = TRACING; - else if (tracing_state == STOPPED) { - ptrace(PTRACE_SEIZE, 1, 0, PTRACE_O_TRACEFORK); - - LOGI("start tracing init"); - - tracing_state = TRACING; - } - - updateStatus(); - - break; - } - case STOP: { - if (tracing_state == TRACING) { - LOGI("stop tracing requested"); - - tracing_state = STOPPING; - strcpy(monitor_stop_reason, "user requested"); - - ptrace(PTRACE_INTERRUPT, 1, 0, 0); - updateStatus(); - } - - break; - } - case EXIT: { - LOGI("prepare for exit ..."); - - tracing_state = EXITING; - strcpy(monitor_stop_reason, "user requested"); - - updateStatus(); - loop.Stop(); - - break; - } - case ZYGOTE64_INJECTED: { - status64.zygote_injected = true; - - updateStatus(); - - break; - } - case ZYGOTE32_INJECTED: { - status32.zygote_injected = true; - - updateStatus(); - - break; - } - case DAEMON64_SET_INFO: { - LOGD("received daemon64 info %s", msg->data); - - /* Will only happen if somehow the daemon restarts */ - if (status64.daemon_info) { - free(status64.daemon_info); - status64.daemon_info = NULL; - } - - status64.daemon_info = (char *)malloc(msg->length); - if (!status64.daemon_info) { - PLOGE("malloc daemon64 info"); - - break; - } - - strcpy(status64.daemon_info, msg->data); - - updateStatus(); - - break; - } - case DAEMON32_SET_INFO: { - LOGD("received daemon32 info %s", msg->data); - - if (status32.daemon_info) { - free(status32.daemon_info); - status32.daemon_info = NULL; - } - - status32.daemon_info = (char *)malloc(msg->length); - if (!status32.daemon_info) { - PLOGE("malloc daemon32 info"); - - break; - } - - strcpy(status32.daemon_info, msg->data); - - updateStatus(); - - break; - } - case DAEMON64_SET_ERROR_INFO: { - LOGD("received daemon64 error info %s", msg->data); - - status64.daemon_running = false; - - if (status64.daemon_error_info) { - free(status64.daemon_error_info); - status64.daemon_error_info = NULL; - } - - status64.daemon_error_info = (char *)malloc(msg->length); - if (!status64.daemon_error_info) { - PLOGE("malloc daemon64 error info"); - - break; - } - - strcpy(status64.daemon_error_info, msg->data); - - updateStatus(); - - break; - } - case DAEMON32_SET_ERROR_INFO: { - LOGD("received daemon32 error info %s", msg->data); - - status32.daemon_running = false; - - if (status32.daemon_error_info) { - free(status32.daemon_error_info); - status32.daemon_error_info = NULL; - } - - status32.daemon_error_info = (char *)malloc(msg->length); - if (!status32.daemon_error_info) { - PLOGE("malloc daemon32 error info"); - - break; - } - - strcpy(status32.daemon_error_info, msg->data); - - updateStatus(); - - break; - } - case SYSTEM_SERVER_STARTED: { - LOGD("system server started, mounting prop"); - - if (mount(prop_path, "/data/adb/modules/zygisksu/module.prop", NULL, MS_BIND, NULL) == -1) { - PLOGE("failed to mount prop"); - } - - break; - } - } - - free(msg); - } - } - - ~SocketHandler() { - if (sock_fd_ >= 0) close(sock_fd_); - } -}; - -constexpr int MAX_RETRY_COUNT = 5; - -#define CREATE_ZYGOTE_START_COUNTER(abi) \ - struct timespec last_zygote##abi = { \ - .tv_sec = 0, \ - .tv_nsec = 0 \ - }; \ - \ - int count_zygote ## abi = 0; \ - bool should_stop_inject ## abi() { \ - struct timespec now = {}; \ - clock_gettime(CLOCK_MONOTONIC, &now); \ - if (now.tv_sec - last_zygote ## abi.tv_sec < 30) \ - count_zygote ## abi++; \ - else \ - count_zygote ## abi = 0; \ - \ - last_zygote##abi = now; \ - \ - return count_zygote##abi >= MAX_RETRY_COUNT; \ - } - -CREATE_ZYGOTE_START_COUNTER(64) -CREATE_ZYGOTE_START_COUNTER(32) - -static bool ensure_daemon_created(bool is_64bit) { - Status *status = is_64bit ? &status64 : &status32; - if (is_64bit) { - LOGD("new zygote started."); - - umount2("/data/adb/modules/zygisksu/module.prop", MNT_DETACH); - } - - status->zygote_injected = false; - - if (status->daemon_pid == -1) { - pid_t pid = fork(); - if (pid < 0) { - PLOGE("create daemon%s", is_64bit ? "64" : "32"); - - return false; - } else if (pid == 0) { - char daemon_name[PATH_MAX] = "./bin/zygiskd"; - strcat(daemon_name, is_64bit ? "64" : "32"); - - execl(daemon_name, daemon_name, NULL); - - PLOGE("exec daemon %s failed", daemon_name); - - exit(1); - } else { - status->supported = true; - status->daemon_pid = pid; - status->daemon_running = true; - - return true; - } - } else { - return status->daemon_running; - } -} - -#define CHECK_DAEMON_EXIT(abi) \ - if (status##abi.supported && pid == status64.daemon_pid) { \ - char status_str[64]; \ - parse_status(status, status_str, sizeof(status_str)); \ - \ - LOGW("daemon" #abi " pid %d exited: %s", pid, status_str); \ - status##abi.daemon_running = false; \ - \ - if (!status##abi.daemon_error_info) { \ - status##abi.daemon_error_info = (char *)malloc(strlen(status_str) + 1); \ - if (!status##abi.daemon_error_info) { \ - LOGE("malloc daemon" #abi " error info failed"); \ - \ - return; \ - } \ - \ - memcpy(status##abi.daemon_error_info, status_str, strlen(status_str) + 1); \ - } \ - \ - updateStatus(); \ - continue; \ - } - -#define PRE_INJECT(abi, is_64) \ - if (strcmp(program, "/system/bin/app_process" # abi) == 0) { \ - tracer = "./bin/zygisk-ptrace" # abi; \ - \ - if (should_stop_inject ## abi()) { \ - LOGW("zygote" # abi " restart too much times, stop injecting"); \ - \ - tracing_state = STOPPING; \ - memcpy(monitor_stop_reason, "zygote crashed", sizeof("zygote crashed")); \ - ptrace(PTRACE_INTERRUPT, 1, 0, 0); \ - \ - break; \ - } \ - if (!ensure_daemon_created(is_64)) { \ - LOGW("daemon" #abi " not running, stop injecting"); \ - \ - tracing_state = STOPPING; \ - memcpy(monitor_stop_reason, "daemon not running", sizeof("daemon not running")); \ - ptrace(PTRACE_INTERRUPT, 1, 0, 0); \ - \ - break; \ - } \ - } - -struct SigChldHandler : public EventHandler { - private: - int signal_fd_; - struct signalfd_siginfo fdsi; - int status; - std::set process; - - public: - bool Init() { - sigset_t mask; - sigemptyset(&mask); - sigaddset(&mask, SIGCHLD); - - if (sigprocmask(SIG_BLOCK, &mask, NULL) == -1) { - PLOGE("set sigprocmask"); - - return false; - } - - signal_fd_ = signalfd(-1, &mask, SFD_NONBLOCK | SFD_CLOEXEC); - if (signal_fd_ == -1) { - PLOGE("create signalfd"); - - return false; - } - - ptrace(PTRACE_SEIZE, 1, 0, PTRACE_O_TRACEFORK); - - return true; - } - - int GetFd() override { - return signal_fd_; - } - - void HandleEvent(EventLoop &, uint32_t) override { - while (1) { - ssize_t s = read(signal_fd_, &fdsi, sizeof(fdsi)); - if (s == -1) { - if (errno == EAGAIN) break; - - PLOGE("read signalfd"); - - continue; - } - - if (s != sizeof(fdsi)) { - LOGW("read %zu != %zu", s, sizeof(fdsi)); - - continue; - } - - if (fdsi.ssi_signo != SIGCHLD) { - LOGW("no sigchld received"); - - continue; - } - - int pid; - while ((pid = waitpid(-1, &status, __WALL | WNOHANG)) != 0) { - if (pid == -1) { - if (tracing_state == STOPPED && errno == ECHILD) break; - PLOGE("waitpid"); - } - - if (pid == 1) { - if (STOPPED_WITH(SIGTRAP, PTRACE_EVENT_FORK)) { - long child_pid; - - ptrace(PTRACE_GETEVENTMSG, pid, 0, &child_pid); - - LOGV("forked %ld", child_pid); - } else if (STOPPED_WITH(SIGTRAP, PTRACE_EVENT_STOP) && tracing_state == STOPPING) { - if (ptrace(PTRACE_DETACH, 1, 0, 0) == -1) PLOGE("failed to detach init"); - - tracing_state = STOPPED; - - LOGI("stop tracing init"); - - continue; - } - - if (WIFSTOPPED(status)) { - if (WPTEVENT(status) == 0) { - if (WSTOPSIG(status) != SIGSTOP && WSTOPSIG(status) != SIGTSTP && WSTOPSIG(status) != SIGTTIN && WSTOPSIG(status) != SIGTTOU) { - LOGW("inject signal sent to init: %s %d", sigabbrev_np(WSTOPSIG(status)), WSTOPSIG(status)); - - ptrace(PTRACE_CONT, pid, 0, WSTOPSIG(status)); - - continue; - } else { - LOGW("suppress stopping signal sent to init: %s %d", sigabbrev_np(WSTOPSIG(status)), WSTOPSIG(status)); - } - } - - ptrace(PTRACE_CONT, pid, 0, 0); - } - - continue; - } - - CHECK_DAEMON_EXIT(64) - CHECK_DAEMON_EXIT(32) - - auto state = process.find(pid); - - if (state == process.end()) { - LOGV("new process %d attached", pid); - - process.emplace(pid); - - ptrace(PTRACE_SETOPTIONS, pid, 0, PTRACE_O_TRACEEXEC); - ptrace(PTRACE_CONT, pid, 0, 0); - - continue; - } else { - if (STOPPED_WITH(SIGTRAP, PTRACE_EVENT_EXEC)) { - char program[PATH_MAX]; - if (get_program(pid, program, sizeof(program)) == -1) { - LOGW("failed to get program %d", pid); - - continue; - } - - LOGV("%d program %s", pid, program); - const char* tracer = NULL; - - do { - if (tracing_state != TRACING) { - LOGW("stop injecting %d because not tracing", pid); - - break; - } - - PRE_INJECT(64, true) - PRE_INJECT(32, false) - - if (tracer != NULL) { - LOGD("stopping %d", pid); - - kill(pid, SIGSTOP); - ptrace(PTRACE_CONT, pid, 0, 0); - waitpid(pid, &status, __WALL); - - if (STOPPED_WITH(SIGSTOP, 0)) { - LOGD("detaching %d", pid); - - ptrace(PTRACE_DETACH, pid, 0, SIGSTOP); - status = 0; - auto p = fork_dont_care(); - - if (p == 0) { - char pid_str[32]; - sprintf(pid_str, "%d", pid); - - execl(tracer, basename(tracer), "trace", pid_str, "--restart", NULL); - - PLOGE("failed to exec, kill"); - - kill(pid, SIGKILL); - exit(1); - } else if (p == -1) { - PLOGE("failed to fork, kill"); - - kill(pid, SIGKILL); - } - } - } - } while (false); - - updateStatus(); - } else { - char status_str[64]; - parse_status(status, status_str, sizeof(status_str)); - - LOGW("process %d received unknown status %s", pid, status_str); - } - - process.erase(state); - if (WIFSTOPPED(status)) { - LOGV("detach process %d", pid); - - ptrace(PTRACE_DETACH, pid, 0, 0); - } - } - } - } - } - - ~SigChldHandler() { - if (signal_fd_ >= 0) close(signal_fd_); - } -}; - -static char pre_section[1024]; -static char post_section[1024]; - -#define WRITE_STATUS_ABI(suffix) \ - if (status ## suffix.supported) { \ - strcat(status_text, " zygote" # suffix ": "); \ - if (tracing_state != TRACING) strcat(status_text, "❓ unknown, "); \ - else if (status ## suffix.zygote_injected) strcat(status_text, "😋 injected, "); \ - else strcat(status_text, "❌ not injected, "); \ - \ - strcat(status_text, "daemon" # suffix ": "); \ - if (status ## suffix.daemon_running) { \ - strcat(status_text, "😋 running "); \ - \ - if (status ## suffix.daemon_info != NULL) { \ - strcat(status_text, "("); \ - strcat(status_text, status ## suffix.daemon_info); \ - strcat(status_text, ")"); \ - } \ - } else { \ - strcat(status_text, "❌ crashed "); \ - \ - if (status ## suffix.daemon_error_info != NULL) { \ - strcat(status_text, "("); \ - strcat(status_text, status ## suffix.daemon_error_info); \ - strcat(status_text, ")"); \ - } \ - } \ - } - -static void updateStatus() { - FILE *prop = fopen(prop_path, "w"); - char status_text[1024] = "monitor: "; - - switch (tracing_state) { - case TRACING: { - strcat(status_text, "😋 tracing"); - - break; - } - case STOPPING: [[fallthrough]]; - case STOPPED: { - strcat(status_text, "❌ stopped"); - - break; - } - case EXITING: { - strcat(status_text, "❌ exited"); - - break; - } - } - - if (tracing_state != TRACING && monitor_stop_reason[0] != '\0') { - strcat(status_text, " ("); - strcat(status_text, monitor_stop_reason); - strcat(status_text, ")"); - } - strcat(status_text, ","); - - WRITE_STATUS_ABI(64) - WRITE_STATUS_ABI(32) - - fprintf(prop, "%s[%s] %s", pre_section, status_text, post_section); - - fclose(prop); -} - -static bool prepare_environment() { - char tmp_path[PATH_MAX]; - rezygiskd_get_path(tmp_path, sizeof(tmp_path)); - - strcat(prop_path, tmp_path); - strcat(prop_path, "/module.prop"); - - close(open(prop_path, O_WRONLY | O_CREAT | O_TRUNC, 0644)); - - FILE *orig_prop = fopen("./module.prop", "r"); - if (orig_prop == NULL) { - PLOGE("failed to open orig prop"); - - return false; - } - - bool after_description = false; - - char line[1024]; - while (fgets(line, sizeof(line), orig_prop) != NULL) { - if (strncmp(line, "description=", strlen("description=")) == 0) { - strcat(pre_section, "description="); - strcat(post_section, line + strlen("description=")); - after_description = true; - - continue; - } - - if (after_description) strcat(post_section, line); - else strcat(pre_section, line); - } - - fclose(orig_prop); - - /* TODO: See if ZYGISK_ENABLED flag is already set, - if so, set a status saying to disable built-in Zygisk. */ - updateStatus(); - - return true; -} - -void init_monitor() { - LOGI("ReZygisk %s", ZKSU_VERSION); - - if (!prepare_environment()) exit(1); - - SocketHandler socketHandler{}; - socketHandler.Init(); - SigChldHandler ptraceHandler{}; - ptraceHandler.Init(); - EventLoop looper; - - looper.Init(); - looper.RegisterHandler(socketHandler, EPOLLIN | EPOLLET); - looper.RegisterHandler(ptraceHandler, EPOLLIN | EPOLLET); - looper.Loop(); - - if (status64.daemon_info) free(status64.daemon_info); - if (status64.daemon_error_info) free(status64.daemon_error_info); - if (status32.daemon_info) free(status32.daemon_info); - if (status32.daemon_error_info) free(status32.daemon_error_info); - - LOGI("exit"); -} - -int send_control_command(enum Command cmd) { - int sockfd = socket(PF_UNIX, SOCK_DGRAM | SOCK_CLOEXEC, 0); - if (sockfd == -1) return -1; - - struct sockaddr_un addr = { - .sun_family = AF_UNIX, - .sun_path = { 0 } - }; - - char tmp_path[PATH_MAX]; - rezygiskd_get_path(tmp_path, sizeof(tmp_path)); - - size_t sun_path_len = snprintf(addr.sun_path, sizeof(addr.sun_path), "%s/%s", tmp_path, SOCKET_NAME); - - socklen_t socklen = sizeof(sa_family_t) + sun_path_len; - - ssize_t nsend = sendto(sockfd, (void *)&cmd, sizeof(cmd), 0, (sockaddr *)&addr, socklen); - - /* TODO: Should we close even when it fails? */ - close(sockfd); - - return nsend != sizeof(cmd) ? -1 : 0; -} diff --git a/loader/src/ptracer/monitor.h b/loader/src/ptracer/monitor.h index c7db0f3..99ed3be 100644 --- a/loader/src/ptracer/monitor.h +++ b/loader/src/ptracer/monitor.h @@ -1,5 +1,5 @@ -#ifndef MAIN_HPP -#define MAIN_HPP +#ifndef MONITOR_H +#define MONITOR_H #include @@ -7,7 +7,7 @@ void init_monitor(); bool trace_zygote(int pid); -enum Command { +enum rezygiskd_command { START = 1, STOP = 2, EXIT = 3, @@ -22,6 +22,6 @@ enum Command { SYSTEM_SERVER_STARTED = 10 }; -int send_control_command(enum Command cmd); +int send_control_command(enum rezygiskd_command cmd); -#endif /* MAIN_HPP */ \ No newline at end of file +#endif /* MONITOR_H */ \ No newline at end of file diff --git a/loader/src/ptracer/ptracer.cpp b/loader/src/ptracer/ptracer.c similarity index 65% rename from loader/src/ptracer/ptracer.cpp rename to loader/src/ptracer/ptracer.c index c8a7571..7ae1254 100644 --- a/loader/src/ptracer/ptracer.cpp +++ b/loader/src/ptracer/ptracer.c @@ -1,20 +1,18 @@ +#include +#include +#include + #include -#include -#include #include #include #include -#include -#include -#include #include #include #include -#include -#include -#include -#include "utils.hpp" +#include + +#include "utils.h" bool inject_on_main(int pid, const char *lib_path) { LOGI("injecting %s to zygote %d", lib_path, pid); @@ -25,16 +23,26 @@ bool inject_on_main(int pid, const char *lib_path) { https://cs.android.com/android/platform/superproject/main/+/main:bionic/libc/private/KernelArgumentBlock.h;l=30;drc=6d1ee77ee32220e4202c3066f7e1f69572967ad8 */ - struct user_regs_struct regs {}, - backup {}; + struct user_regs_struct regs = { 0 }; - /* WARNING: C++ keyword */ - std::vector map = MapInfo::Scan(std::to_string(pid)); - if (!get_regs(pid, regs)) return false; + char pid_maps[PATH_MAX]; + snprintf(pid_maps, sizeof(pid_maps), "/proc/%d/maps", pid); + + struct maps *map = parse_maps(pid_maps); + if (map == NULL) { + LOGE("failed to parse remote maps"); + + return false; + } + + if (!get_regs(pid, ®s)) return false; uintptr_t arg = (uintptr_t)regs.REG_SP; - LOGV("kernel argument %" PRIxPTR " %s", arg, get_addr_mem_region(map, arg).c_str()); + char addr_mem_region[1024]; + get_addr_mem_region(map, arg, addr_mem_region, sizeof(addr_mem_region)); + + LOGV("kernel argument %" PRIxPTR " %s", arg, addr_mem_region); int argc; char **argv = (char **)((uintptr_t *)arg + 1); @@ -43,18 +51,16 @@ bool inject_on_main(int pid, const char *lib_path) { read_proc(pid, arg, &argc, sizeof(argc)); LOGV("argc %d", argc); - /* WARNING: C++ keyword */ - auto envp = argv + argc + 1; + char **envp = argv + argc + 1; LOGV("envp %p", (void *)envp); - /* WARNING: C++ keyword */ - auto p = envp; + char **p = envp; while (1) { uintptr_t *buf; read_proc(pid, (uintptr_t)p, &buf, sizeof(buf)); if (buf == NULL) break; - + /* TODO: Why ++p? */ p++; } @@ -63,7 +69,9 @@ bool inject_on_main(int pid, const char *lib_path) { p++; ElfW(auxv_t) *auxv = (ElfW(auxv_t) *)p; - LOGV("auxv %p %s", auxv, get_addr_mem_region(map, (uintptr_t) auxv).c_str()); + + get_addr_mem_region(map, (uintptr_t)auxv, addr_mem_region, sizeof(addr_mem_region)); + LOGV("auxv %p %s", auxv, addr_mem_region); ElfW(auxv_t) *v = auxv; uintptr_t entry_addr = 0; @@ -78,8 +86,9 @@ bool inject_on_main(int pid, const char *lib_path) { entry_addr = (uintptr_t)buf.a_un.a_val; addr_of_entry_addr = (uintptr_t)v + offsetof(ElfW(auxv_t), a_un); + get_addr_mem_region(map, entry_addr, addr_mem_region, sizeof(addr_mem_region)); LOGV("entry address %" PRIxPTR " %s (entry=%" PRIxPTR ", entry_addr=%" PRIxPTR ")", entry_addr, - get_addr_mem_region(map, entry_addr).c_str(), (uintptr_t)v, addr_of_entry_addr); + addr_mem_region, (uintptr_t)v, addr_of_entry_addr); break; } @@ -113,7 +122,7 @@ bool inject_on_main(int pid, const char *lib_path) { int status; wait_for_trace(pid, &status, __WALL); if (WIFSTOPPED(status) && WSTOPSIG(status) == SIGSEGV) { - if (!get_regs(pid, regs)) return false; + if (!get_regs(pid, ®s)) return false; if (((int)regs.REG_IP & ~1) != ((int)break_addr & ~1)) { LOGE("stopped at unknown addr %p", (void *) regs.REG_IP); @@ -128,13 +137,25 @@ bool inject_on_main(int pid, const char *lib_path) { if (!write_proc(pid, (uintptr_t) addr_of_entry_addr, &entry_addr, sizeof(entry_addr))) return false; /* backup registers */ + struct user_regs_struct backup; memcpy(&backup, ®s, sizeof(regs)); - /* WARNING: C++ keyword */ - map = MapInfo::Scan(std::to_string(pid)); + free_maps(map); + + map = parse_maps(pid_maps); + if (!map) { + LOGE("failed to parse remote maps"); + + return false; + } + + struct maps *local_map = parse_maps("/proc/self/maps"); + if (!local_map) { + LOGE("failed to parse local maps"); + + return false; + } - /* WARNING: C++ keyword */ - std::vector local_map = MapInfo::Scan(); void *libc_return_addr = find_module_return_addr(map, "libc.so"); LOGD("libc return addr %p", libc_return_addr); @@ -142,17 +163,19 @@ bool inject_on_main(int pid, const char *lib_path) { void *dlopen_addr = find_func_addr(local_map, map, "libdl.so", "dlopen"); if (dlopen_addr == NULL) return false; - /* WARNING: C++ keyword */ - std::vector args; + long *args = (long *)malloc(3 * sizeof(long)); + if (args == NULL) { + LOGE("malloc args"); - /* WARNING: C++ keyword */ - uintptr_t str = push_string(pid, regs, lib_path); + return false; + } - args.clear(); - args.push_back((long) str); - args.push_back((long) RTLD_NOW); + uintptr_t str = push_string(pid, ®s, lib_path); - uintptr_t remote_handle = remote_call(pid, regs, (uintptr_t)dlopen_addr, (uintptr_t)libc_return_addr, args); + args[0] = (long) str; + args[1] = (long) RTLD_NOW; + + uintptr_t remote_handle = remote_call(pid, ®s, (uintptr_t)dlopen_addr, (uintptr_t)libc_return_addr, args, 2); LOGD("remote handle %p", (void *)remote_handle); if (remote_handle == 0) { LOGE("handle is null"); @@ -162,37 +185,47 @@ bool inject_on_main(int pid, const char *lib_path) { if (dlerror_addr == NULL) { LOGE("find dlerror"); + free(args); + return false; } - args.clear(); + uintptr_t dlerror_str_addr = remote_call(pid, ®s, (uintptr_t)dlerror_addr, (uintptr_t)libc_return_addr, args, 0); + LOGD("dlerror str %p", (void *)dlerror_str_addr); + if (dlerror_str_addr == 0) { + LOGE("dlerror str is null"); - uintptr_t dlerror_str_addr = remote_call(pid, regs, (uintptr_t)dlerror_addr, (uintptr_t)libc_return_addr, args); - LOGD("dlerror str %p", (void*) dlerror_str_addr); - if (dlerror_str_addr == 0) return false; + free(args); + + return false; + } void *strlen_addr = find_func_addr(local_map, map, "libc.so", "strlen"); if (strlen_addr == NULL) { LOGE("find strlen"); + free(args); + return false; } - args.clear(); - args.push_back(dlerror_str_addr); + args[0] = (long) dlerror_str_addr; - uintptr_t dlerror_len = remote_call(pid, regs, (uintptr_t)strlen_addr, (uintptr_t)libc_return_addr, args); + uintptr_t dlerror_len = remote_call(pid, ®s, (uintptr_t)strlen_addr, (uintptr_t)libc_return_addr, args, 1); if (dlerror_len <= 0) { LOGE("dlerror len <= 0"); + free(args); + return false; } - /* NOTICE: C++ -> C */ char *err = (char *)malloc((dlerror_len + 1) * sizeof(char)); if (err == NULL) { LOGE("malloc err"); + free(args); + return false; } @@ -201,6 +234,7 @@ bool inject_on_main(int pid, const char *lib_path) { LOGE("dlerror info %s", err); free(err); + free(args); return false; } @@ -209,12 +243,13 @@ bool inject_on_main(int pid, const char *lib_path) { void *dlsym_addr = find_func_addr(local_map, map, "libdl.so", "dlsym"); if (dlsym_addr == NULL) return false; - args.clear(); - str = push_string(pid, regs, "entry"); - args.push_back(remote_handle); - args.push_back((long) str); + free_maps(local_map); - uintptr_t injector_entry = remote_call(pid, regs, (uintptr_t)dlsym_addr, (uintptr_t)libc_return_addr, args); + str = push_string(pid, ®s, "entry"); + args[0] = remote_handle; + args[1] = (long) str; + + uintptr_t injector_entry = remote_call(pid, ®s, (uintptr_t)dlsym_addr, (uintptr_t)libc_return_addr, args, 2); LOGD("injector entry %p", (void *)injector_entry); if (injector_entry == 0) { LOGE("injector entry is null"); @@ -223,38 +258,41 @@ bool inject_on_main(int pid, const char *lib_path) { } /* record the address range of libzygisk.so */ - map = MapInfo::Scan(std::to_string(pid)); - void *start_addr = nullptr; + map = parse_maps(pid_maps); + + void *start_addr = NULL; size_t block_size = 0; - for (auto &info : map) { - if (strstr(info.path.c_str(), "libzygisk.so")) { - void *addr = (void *)info.start; - if (start_addr == nullptr) start_addr = addr; - size_t size = info.end - info.start; - block_size += size; - LOGD("found block %s: [%p-%p] with size %zu", info.path.c_str(), addr, (void *)info.end, size); - } + + for (size_t i = 0; i < map->size; i++) { + if (!strstr(map->maps[i].path, "libzygisk.so")) continue; + + if (start_addr == NULL) start_addr = (void *)map->maps[i].start; + + size_t size = map->maps[i].end - map->maps[i].start; + block_size += size; + + LOGD("found block %s: [%p-%p] with size %zu", map->maps[i].path, (void *)map->maps[i].start, + (void *)map->maps[i].end, size); } + free_maps(map); + /* call injector entry(start_addr, block_size, path) */ - args.clear(); - args.push_back((uintptr_t) start_addr); - args.push_back(block_size); + args[0] = (uintptr_t)start_addr; + args[1] = block_size; + str = push_string(pid, ®s, rezygiskd_get_path()); + args[2] = (uintptr_t)str; - char tmp_path[PATH_MAX]; - rezygiskd_get_path(tmp_path, sizeof(tmp_path)); + remote_call(pid, ®s, injector_entry, (uintptr_t)libc_return_addr, args, 3); - str = push_string(pid, regs, tmp_path); - args.push_back((long) str); - - remote_call(pid, regs, injector_entry, (uintptr_t)libc_return_addr, args); + free(args); /* reset pc to entry */ backup.REG_IP = (long) entry_addr; LOGD("invoke entry"); /* restore registers */ - if (!set_regs(pid, backup)) return false; + if (!set_regs(pid, &backup)) return false; return true; } else { @@ -290,11 +328,8 @@ bool trace_zygote(int pid) { WAIT_OR_DIE if (STOPPED_WITH(SIGSTOP, PTRACE_EVENT_STOP)) { - /* WARNING: C++ keyword */ char lib_path[PATH_MAX]; - rezygiskd_get_path(lib_path, sizeof(lib_path)); - - strcat(lib_path,"/lib" LP_SELECT("", "64") "/libzygisk.so"); + snprintf(lib_path, sizeof(lib_path), "%s/lib" LP_SELECT("", "64") "/libzygisk.so", rezygiskd_get_path()); if (!inject_on_main(pid, lib_path)) { LOGE("failed to inject"); diff --git a/loader/src/ptracer/utils.c b/loader/src/ptracer/utils.c new file mode 100644 index 0000000..5aa9a35 --- /dev/null +++ b/loader/src/ptracer/utils.c @@ -0,0 +1,578 @@ +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include "logging.h" + +#include "utils.h" + +bool switch_mnt_ns(int pid, int *fd) { + int nsfd, old_nsfd = -1; + + char path[PATH_MAX]; + if (pid == 0) { + if (fd != NULL) { + nsfd = *fd; + *fd = -1; + } else return false; + + snprintf(path, sizeof(path), "/proc/self/fd/%d", nsfd); + } else { + if (fd != NULL) { + old_nsfd = open("/proc/self/ns/mnt", O_RDONLY | O_CLOEXEC); + if (old_nsfd == -1) { + PLOGE("get old nsfd"); + + return false; + } + + *fd = old_nsfd; + } + + snprintf(path, sizeof(path), "/proc/%d/ns/mnt", pid); + + nsfd = open(path, O_RDONLY | O_CLOEXEC); + if (nsfd == -1) { + PLOGE("open nsfd %s", path); + + close(old_nsfd); + + return false; + } + } + + if (setns(nsfd, CLONE_NEWNS) == -1) { + PLOGE("set ns to %s", path); + + close(nsfd); + close(old_nsfd); + + return false; + } + + close(nsfd); + + return true; +} + +struct maps *parse_maps(const char *filename) { + FILE *fp = fopen(filename, "r"); + if (!fp) { + LOGE("Failed to open %s", filename); + + return NULL; + } + + struct maps *maps = (struct maps *)malloc(sizeof(struct maps)); + if (!maps) { + LOGE("Failed to allocate memory for maps"); + + fclose(fp); + + return NULL; + } + + char line[4096 * 2]; + size_t i = 0; + + while (fgets(line, sizeof(line), fp) != NULL) { + /* INFO: Remove line ending at the end */ + line[strlen(line) - 1] = '\0'; + + uintptr_t addr_start; + uintptr_t addr_end; + uintptr_t addr_offset; + ino_t inode; + unsigned int dev_major; + unsigned int dev_minor; + char permissions[5] = ""; + int path_offset; + + sscanf(line, + "%" PRIxPTR "-%" PRIxPTR " %4s %" PRIxPTR " %x:%x %lu %n%*s", + &addr_start, &addr_end, permissions, &addr_offset, &dev_major, &dev_minor, + &inode, &path_offset); + + while (isspace(line[path_offset])) { + path_offset++; + } + + maps->maps = (struct map *)realloc(maps->maps, (i + 1) * sizeof(struct map)); + if (!maps->maps) { + LOGE("Failed to allocate memory for maps->maps"); + + maps->size = i; + + fclose(fp); + free_maps(maps); + + return NULL; + } + + maps->maps[i].start = addr_start; + maps->maps[i].end = addr_end; + maps->maps[i].offset = addr_offset; + + maps->maps[i].perms = 0; + if (permissions[0] == 'r') maps->maps[i].perms |= PROT_READ; + if (permissions[1] == 'w') maps->maps[i].perms |= PROT_WRITE; + if (permissions[2] == 'x') maps->maps[i].perms |= PROT_EXEC; + + maps->maps[i].is_private = permissions[3] == 'p'; + maps->maps[i].dev = makedev(dev_major, dev_minor); + maps->maps[i].inode = inode; + maps->maps[i].path = strdup(line + path_offset); + if (!maps->maps[i].path) { + LOGE("Failed to allocate memory for maps->maps[%zu].path", i); + + maps->size = i; + + fclose(fp); + free_maps(maps); + + return NULL; + } + + i++; + } + + fclose(fp); + + maps->size = i; + + return maps; +} + +void free_maps(struct maps *maps) { + if (!maps) { + return; + } + + for (size_t i = 0; i < maps->size; i++) { + free((void *)maps->maps[i].path); + } + + free(maps->maps); + free(maps); +} + +ssize_t write_proc(int pid, uintptr_t remote_addr, const void *buf, size_t len) { + LOGV("write to remote addr %" PRIxPTR " size %zu", remote_addr, len); + + struct iovec local = { + .iov_base = (void *)buf, + .iov_len = len + }; + + struct iovec remote = { + .iov_base = (void *)remote_addr, + .iov_len = len + }; + + ssize_t l = process_vm_writev(pid, &local, 1, &remote, 1, 0); + if (l == -1) PLOGE("process_vm_writev"); + else if ((size_t)l != len) LOGW("not fully written: %zu, excepted %zu", l, len); + + return l; +} + +ssize_t read_proc(int pid, uintptr_t remote_addr, void *buf, size_t len) { + struct iovec local = { + .iov_base = (void *)buf, + .iov_len = len + }; + + struct iovec remote = { + .iov_base = (void *)remote_addr, + .iov_len = len + }; + + ssize_t l = process_vm_readv(pid, &local, 1, &remote, 1, 0); + if (l == -1) PLOGE("process_vm_readv"); + else if ((size_t)l != len) LOGW("not fully read: %zu, excepted %zu", l, len); + + return l; +} + +bool get_regs(int pid, struct user_regs_struct *regs) { + #if defined(__x86_64__) || defined(__i386__) + if (ptrace(PTRACE_GETREGS, pid, 0, regs) == -1) { + PLOGE("getregs"); + + return false; + } + #elif defined(__aarch64__) || defined(__arm__) + struct iovec iov = { + .iov_base = regs, + .iov_len = sizeof(struct user_regs_struct), + }; + + if (ptrace(PTRACE_GETREGSET, pid, NT_PRSTATUS, &iov) == -1) { + PLOGE("getregs"); + + return false; + } + #endif + + return true; +} + +bool set_regs(int pid, struct user_regs_struct *regs) { + #if defined(__x86_64__) || defined(__i386__) + if (ptrace(PTRACE_SETREGS, pid, 0, regs) == -1) { + PLOGE("setregs"); + + return false; + } + #elif defined(__aarch64__) || defined(__arm__) + struct iovec iov = { + .iov_base = regs, + .iov_len = sizeof(struct user_regs_struct), + }; + + if (ptrace(PTRACE_SETREGSET, pid, NT_PRSTATUS, &iov) == -1) { + PLOGE("setregs"); + + return false; + } + #endif + + return true; +} + +void get_addr_mem_region(struct maps *info, uintptr_t addr, char *buf, size_t buf_size) { + for (size_t i = 0; i < info->size; i++) { + /* TODO: Early "leave" */ + if (info->maps[i].start <= addr && info->maps[i].end > addr) { + snprintf(buf, buf_size, "%s %s%s%s", + info->maps[i].path, + info->maps[i].perms & PROT_READ ? "r" : "-", + info->maps[i].perms & PROT_WRITE ? "w" : "-", + info->maps[i].perms & PROT_EXEC ? "x" : "-"); + + return; + } + } + + snprintf(buf, buf_size, ""); +} + +/* INFO: strrchr but without modifying the string */ +const char *position_after(const char *str, const char needle) { + const char *positioned = str + strlen(str); + + int i = strlen(str); + while (i != 0) { + i--; + if (str[i] == needle) { + positioned = str + i + 1; + + break; + } + } + + return positioned; +} + +void *find_module_return_addr(struct maps *map, const char *suffix) { + for (size_t i = 0; i < map->size; i++) { + /* TODO: Make it NULL in 1 length path */ + if (map->maps[i].path == NULL) continue; + + const char *file_name = position_after(map->maps[i].path, '/'); + if (!file_name) continue; + + if (strlen(file_name) < strlen(suffix) || (map->maps[i].perms & PROT_EXEC) != 0 || strncmp(file_name, suffix, strlen(suffix)) != 0) continue; + + return (void *)map->maps[i].start; + } + + return NULL; +} + +void *find_module_base(struct maps *map, const char *suffix) { + for (size_t i = 0; i < map->size; i++) { + /* TODO: Make it NULL in 1 length path */ + if (map->maps[i].path == NULL) continue; + + const char *file_name = position_after(map->maps[i].path, '/'); + if (!file_name) continue; + + if (strlen(file_name) < strlen(suffix) || map->maps[i].offset != 0 || strncmp(file_name, suffix, strlen(suffix)) != 0) continue; + + return (void *)map->maps[i].start; + } + + return NULL; +} + +void *find_func_addr(struct maps *local_info, struct maps *remote_info, const char *module, const char *func) { + void *lib = dlopen(module, RTLD_NOW); + if (lib == NULL) { + LOGE("failed to open lib %s: %s", module, dlerror()); + + return NULL; + } + + uint8_t *sym = (uint8_t *)dlsym(lib, func); + if (sym == NULL) { + LOGE("failed to find sym %s in %s: %s", func, module, dlerror()); + + dlclose(lib); + + return NULL; + } + + LOGD("sym %s: %p", func, sym); + + dlclose(lib); + + uint8_t *local_base = (uint8_t *)find_module_base(local_info, module); + if (local_base == NULL) { + LOGE("failed to find local base for module %s", module); + + return NULL; + } + + uint8_t *remote_base = (uint8_t *)find_module_base(remote_info, module); + if (remote_base == NULL) { + LOGE("failed to find remote base for module %s", module); + + return NULL; + } + + LOGD("found local base %p remote base %p", local_base, remote_base); + + uint8_t *addr = (sym - local_base) + remote_base; + LOGD("addr %p", addr); + + return addr; +} + +void align_stack(struct user_regs_struct *regs, long preserve) { + /* INFO: ~0xf is a negative value, and REG_SP is unsigned, + so we must cast REG_SP to signed type before subtracting + then cast back to unsigned type. + */ + regs->REG_SP = (uintptr_t)((intptr_t)(regs->REG_SP - preserve) & ~0xf); +} + +uintptr_t push_string(int pid, struct user_regs_struct *regs, const char *str) { + size_t len = strlen(str) + 1; + + regs->REG_SP -= len; + + align_stack(regs, 0); + + uintptr_t addr = (uintptr_t)regs->REG_SP; + if (!write_proc(pid, addr, str, len)) LOGE("failed to write string %s", str); + + LOGD("pushed string %" PRIxPTR, addr); + + return addr; +} + +uintptr_t remote_call(int pid, struct user_regs_struct *regs, uintptr_t func_addr, uintptr_t return_addr, long *args, size_t args_size) { + align_stack(regs, 0); + + LOGV("calling remote function %" PRIxPTR " args %zu", func_addr, args_size); + + for (size_t i = 0; i < args_size; i++) { + LOGV("arg %p", (void *)args[i]); + } + + #if defined(__x86_64__) + if (args_size >= 1) regs->rdi = args[0]; + if (args_size >= 2) regs->rsi = args[1]; + if (args_size >= 3) regs->rdx = args[2]; + if (args_size >= 4) regs->rcx = args[3]; + if (args_size >= 5) regs->r8 = args[4]; + if (args_size >= 6) regs->r9 = args[5]; + if (args_size > 6) { + long remain = (args_size - 6L) * sizeof(long); + align_stack(regs, remain); + + if (!write_proc(pid, (uintptr_t) regs->REG_SP, args, remain)) LOGE("failed to push arguments"); + } + + regs->REG_SP -= sizeof(long); + + if (!write_proc(pid, (uintptr_t) regs->REG_SP, &return_addr, sizeof(return_addr))) LOGE("failed to write return addr"); + + regs->REG_IP = func_addr; + #elif defined(__i386__) + if (args_size > 0) { + long remain = (args_size) * sizeof(long); + align_stack(regs, remain); + + if (!write_proc(pid, (uintptr_t) regs->REG_SP, args, remain)) LOGE("failed to push arguments"); + } + + regs->REG_SP -= sizeof(long); + + if (!write_proc(pid, (uintptr_t) regs->REG_SP, &return_addr, sizeof(return_addr))) LOGE("failed to write return addr"); + + regs->REG_IP = func_addr; + #elif defined(__aarch64__) + for (size_t i = 0; i < args_size && i < 8; i++) { + regs->regs[i] = args[i]; + } + + if (args_size > 8) { + long remain = (args_size - 8) * sizeof(long); + align_stack(regs, remain); + + write_proc(pid, (uintptr_t)regs->REG_SP, args, remain); + } + + regs->regs[30] = return_addr; + regs->REG_IP = func_addr; + #elif defined(__arm__) + for (size_t i = 0; i < args_size && i < 4; i++) { + regs->uregs[i] = args[i]; + } + + if (args_size > 4) { + long remain = (args_size - 4) * sizeof(long); + align_stack(regs, remain); + + write_proc(pid, (uintptr_t)regs->REG_SP, args, remain); + } + + regs->uregs[14] = return_addr; + regs->REG_IP = func_addr; + + unsigned long CPSR_T_MASK = 1lu << 5; + + if ((regs->REG_IP & 1) != 0) { + regs->REG_IP = regs->REG_IP & ~1; + regs->uregs[16] = regs->uregs[16] | CPSR_T_MASK; + } else { + regs->uregs[16] = regs->uregs[16] & ~CPSR_T_MASK; + } + #endif + + if (!set_regs(pid, regs)) { + LOGE("failed to set regs"); + + return 0; + } + + ptrace(PTRACE_CONT, pid, 0, 0); + + int status; + wait_for_trace(pid, &status, __WALL); + if (!get_regs(pid, regs)) { + LOGE("failed to get regs after call"); + + return 0; + } + + if (WSTOPSIG(status) == SIGSEGV) { + if ((uintptr_t)regs->REG_IP != return_addr) { + LOGE("wrong return addr %p", (void *) regs->REG_IP); + + return 0; + } + + return regs->REG_RET; + } else { + char status_str[64]; + parse_status(status, status_str, sizeof(status_str)); + + LOGE("stopped by other reason %s at addr %p", status_str, (void *)regs->REG_IP); + } + + return 0; +} + +int fork_dont_care() { + pid_t pid = fork(); + + if (pid < 0) PLOGE("fork 1"); + else if (pid == 0) { + pid = fork(); + if (pid < 0) PLOGE("fork 2"); + else if (pid > 0) exit(0); + } else { + int status; + waitpid(pid, &status, __WALL); + } + + return pid; +} + +void wait_for_trace(int pid, int *status, int flags) { + while (1) { + pid_t result = waitpid(pid, status, flags); + if (result == -1) { + if (errno == EINTR) continue; + + PLOGE("wait %d failed", pid); + exit(1); + } + + if (!WIFSTOPPED(*status)) { + char status_str[64]; + parse_status(*status, status_str, sizeof(status_str)); + + LOGE("process %d not stopped for trace: %s, exit", pid, status_str); + + exit(1); + } + + return; + } +} + +void parse_status(int status, char *buf, size_t len) { + snprintf(buf, len, "0x%x ", status); + + if (WIFEXITED(status)) { + snprintf(buf + strlen(buf), len - strlen(buf), "exited with %d", WEXITSTATUS(status)); + } else if (WIFSIGNALED(status)) { + snprintf(buf + strlen(buf), len - strlen(buf), "signaled with %s(%d)", sigabbrev_np(WTERMSIG(status)), WTERMSIG(status)); + } else if (WIFSTOPPED(status)) { + snprintf(buf + strlen(buf), len - strlen(buf), "stopped by "); + + int stop_sig = WSTOPSIG(status); + snprintf(buf + strlen(buf), len - strlen(buf), "signal=%s(%d),", sigabbrev_np(stop_sig), stop_sig); + snprintf(buf + strlen(buf), len - strlen(buf), "event=%s", parse_ptrace_event(status)); + } else { + snprintf(buf + strlen(buf), len - strlen(buf), "unknown"); + } +} + +int get_program(int pid, char *buf, size_t size) { + char path[PATH_MAX]; + snprintf(path, sizeof(path), "/proc/%d/exe", pid); + + ssize_t sz = readlink(path, buf, size); + + if (sz == -1) { + PLOGE("readlink /proc/%d/exe", pid); + + return -1; + } + + buf[sz] = '\0'; + + return 0; +} diff --git a/loader/src/ptracer/utils.cpp b/loader/src/ptracer/utils.cpp deleted file mode 100644 index 1acc32c..0000000 --- a/loader/src/ptracer/utils.cpp +++ /dev/null @@ -1,528 +0,0 @@ -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#include "utils.hpp" -#include "logging.h" - -bool switch_mnt_ns(int pid, int *fd) { - int nsfd, old_nsfd = -1; - - /* WARNING: C++ keyword */ - char path[PATH_MAX]; - if (pid == 0) { - if (fd != NULL) { - nsfd = *fd; - *fd = -1; - } else return false; - - snprintf(path, sizeof(path), "/proc/self/fd/%d", nsfd); - } else { - if (fd != NULL) { - old_nsfd = open("/proc/self/ns/mnt", O_RDONLY | O_CLOEXEC); - if (old_nsfd == -1) { - PLOGE("get old nsfd"); - - return false; - } - - *fd = old_nsfd; - } - - snprintf(path, sizeof(path), "/proc/%d/ns/mnt", pid); - - nsfd = open(path, O_RDONLY | O_CLOEXEC); - if (nsfd == -1) { - PLOGE("open nsfd %s", path); - - close(old_nsfd); - - return false; - } - } - - if (setns(nsfd, CLONE_NEWNS) == -1) { - PLOGE("set ns to %s", path); - - close(nsfd); - close(old_nsfd); - - return false; - } - - close(nsfd); - - return true; -} - -/* WARNING: C++ keyword */ -std::vector MapInfo::Scan(const std::string &pid) { - constexpr static auto kPermLength = 5; - constexpr static auto kMapEntry = 7; - - /* WARNING: C++ keyword */ - std::vector info; - char file_name[NAME_MAX]; - snprintf(file_name, sizeof(file_name), "/proc/%s/maps", pid.c_str()); - - /* WARNING: C++ keyword */ - auto maps = std::unique_ptr{fopen(file_name, "r"), &fclose}; - if (maps) { - char *line = NULL; - size_t len = 0; - ssize_t read; - - /* WARNING: C++ keyword */ - while ((read = getline(&line, &len, maps.get())) > 0) { - line[read - 1] = '\0'; - - uintptr_t start = 0; - uintptr_t end = 0; - uintptr_t off = 0; - ino_t inode = 0; - unsigned int dev_major = 0; - unsigned int dev_minor = 0; - - /* WARNING: C++ keyword */ - std::array perm {'\0'}; - - int path_off; - if (sscanf(line, "%" PRIxPTR "-%" PRIxPTR " %4s %" PRIxPTR " %x:%x %lu %n%*s", &start, - &end, perm.data(), &off, &dev_major, &dev_minor, &inode, - &path_off) != kMapEntry) continue; - - while (path_off < read && isspace(line[path_off])) path_off++; - - /* WARNING: C++ keyword */ - MapInfo &ref = info.emplace_back(MapInfo{ - start, - end, - 0, - perm[3] == 'p', - off, - static_cast(makedev(dev_major, dev_minor)), - inode, - line + path_off - }); - - if (perm[0] == 'r') ref.perms |= PROT_READ; - if (perm[1] == 'w') ref.perms |= PROT_WRITE; - if (perm[2] == 'x') ref.perms |= PROT_EXEC; - } - - free(line); - } - - return info; -} - -ssize_t write_proc(int pid, uintptr_t remote_addr, const void *buf, size_t len) { - LOGV("write to remote addr %" PRIxPTR " size %zu", remote_addr, len); - - struct iovec local = { - .iov_base = (void *)buf, - .iov_len = len - }; - - struct iovec remote = { - .iov_base = (void *)remote_addr, - .iov_len = len - }; - - ssize_t l = process_vm_writev(pid, &local, 1, &remote, 1, 0); - if (l == -1) PLOGE("process_vm_writev"); - else if ((size_t)l != len) LOGW("not fully written: %zu, excepted %zu", l, len); - - return l; -} - -ssize_t read_proc(int pid, uintptr_t remote_addr, void *buf, size_t len) { - struct iovec local = { - .iov_base = (void *)buf, - .iov_len = len - }; - - struct iovec remote = { - .iov_base = (void *)remote_addr, - .iov_len = len - }; - - ssize_t l = process_vm_readv(pid, &local, 1, &remote, 1, 0); - if (l == -1) PLOGE("process_vm_readv"); - else if ((size_t)l != len) LOGW("not fully read: %zu, excepted %zu", l, len); - - return l; -} - -bool get_regs(int pid, struct user_regs_struct ®s) { - #if defined(__x86_64__) || defined(__i386__) - if (ptrace(PTRACE_GETREGS, pid, 0, ®s) == -1) { - PLOGE("getregs"); - - return false; - } - #elif defined(__aarch64__) || defined(__arm__) - struct iovec iov = { - .iov_base = ®s, - .iov_len = sizeof(struct user_regs_struct), - }; - - if (ptrace(PTRACE_GETREGSET, pid, NT_PRSTATUS, &iov) == -1) { - PLOGE("getregs"); - - return false; - } - #endif - - return true; -} - -bool set_regs(int pid, struct user_regs_struct ®s) { - #if defined(__x86_64__) || defined(__i386__) - if (ptrace(PTRACE_SETREGS, pid, 0, ®s) == -1) { - PLOGE("setregs"); - - return false; - } - #elif defined(__aarch64__) || defined(__arm__) - struct iovec iov = { - .iov_base = ®s, - .iov_len = sizeof(struct user_regs_struct), - }; - - if (ptrace(PTRACE_SETREGSET, pid, NT_PRSTATUS, &iov) == -1) { - PLOGE("setregs"); - - return false; - } - #endif - - return true; -} - -/* WARNING: C++ keyword */ -std::string get_addr_mem_region(std::vector &info, uintptr_t addr) { - /* WARNING: C++ keyword */ - for (auto &map: info) { - if (map.start <= addr && map.end > addr) { - /* WARNING: C++ keyword */ - auto s = std::string(map.path); - - s += ' '; - s += map.perms & PROT_READ ? 'r' : '-'; - s += map.perms & PROT_WRITE ? 'w' : '-'; - s += map.perms & PROT_EXEC ? 'x' : '-'; - - return s; - } - } - - return ""; -} - -/* WARNING: C++ keyword */ -void *find_module_return_addr(std::vector &info, std::string_view suffix) { - /* WARNING: C++ keyword */ - for (auto &map: info) { - /* WARNING: C++ keyword */ - if ((map.perms & PROT_EXEC) == 0 && map.path.ends_with(suffix)) return (void *)map.start; - } - - return NULL; -} - -/* WARNING: C++ keyword */ -void *find_module_base(std::vector &info, std::string_view suffix) { - /* WARNING: C++ keyword */ - for (auto &map: info) { - /* WARNING: C++ keyword */ - if (map.offset == 0 && map.path.ends_with(suffix)) return (void *)map.start; - } - - return NULL; -} - -/* WARNING: C++ keyword */ -void *find_func_addr(std::vector &local_info, std::vector &remote_info, std::string_view module, std::string_view func) { - void *lib = dlopen(module.data(), RTLD_NOW); - if (lib == NULL) { - LOGE("failed to open lib %s: %s", module.data(), dlerror()); - - return NULL; - } - - uint8_t *sym = (uint8_t *)dlsym(lib, func.data()); - if (sym == NULL) { - LOGE("failed to find sym %s in %s: %s", func.data(), module.data(), dlerror()); - - dlclose(lib); - - return NULL; - } - - LOGD("sym %s: %p", func.data(), sym); - - dlclose(lib); - - uint8_t *local_base = (uint8_t *)find_module_base(local_info, module); - if (local_base == NULL) { - LOGE("failed to find local base for module %s", module.data()); - - return NULL; - } - - uint8_t *remote_base = (uint8_t *)find_module_base(remote_info, module); - if (remote_base == NULL) { - LOGE("failed to find remote base for module %s", module.data()); - - return NULL; - } - - LOGD("found local base %p remote base %p", local_base, remote_base); - - uint8_t *addr = (sym - local_base) + remote_base; - LOGD("addr %p", addr); - - return addr; -} - -/* WARNING: C++ keyword */ -void align_stack(struct user_regs_struct ®s, long preserve) { - /* INFO: ~0xf is a negative value, and REG_SP is unsigned, - so we must cast REG_SP to signed type before subtracting - then cast back to unsigned type. - */ - regs.REG_SP = (uintptr_t)((intptr_t)(regs.REG_SP - preserve) & ~0xf); -} - -/* WARNING: C++ keyword */ -uintptr_t push_string(int pid, struct user_regs_struct ®s, const char *str) { - size_t len = strlen(str) + 1; - - regs.REG_SP -= len; - - align_stack(regs); - - uintptr_t addr = (uintptr_t)regs.REG_SP; - if (!write_proc(pid, addr, str, len)) LOGE("failed to write string %s", str); - - LOGD("pushed string %" PRIxPTR, addr); - - return addr; -} - -/* WARNING: C++ keyword */ -uintptr_t remote_call(int pid, struct user_regs_struct ®s, uintptr_t func_addr, uintptr_t return_addr, std::vector &args) { - align_stack(regs); - - /* WARNING: C++ keyword */ - LOGV("calling remote function %" PRIxPTR " args %zu", func_addr, args.size()); - - /* WARNING: C++ keyword */ - for (auto &a: args) { - LOGV("arg %p", (void *) a); - } - - #if defined(__x86_64__) - if (args.size() >= 1) regs.rdi = args[0]; - if (args.size() >= 2) regs.rsi = args[1]; - if (args.size() >= 3) regs.rdx = args[2]; - if (args.size() >= 4) regs.rcx = args[3]; - if (args.size() >= 5) regs.r8 = args[4]; - if (args.size() >= 6) regs.r9 = args[5]; - if (args.size() > 6) { - long remain = (args.size() - 6L) * sizeof(long); - align_stack(regs, remain); - - if (!write_proc(pid, (uintptr_t) regs.REG_SP, args.data(), remain)) LOGE("failed to push arguments"); - } - - regs.REG_SP -= sizeof(long); - - if (!write_proc(pid, (uintptr_t) regs.REG_SP, &return_addr, sizeof(return_addr))) LOGE("failed to write return addr"); - - regs.REG_IP = func_addr; - #elif defined(__i386__) - if (args.size() > 0) { - long remain = (args.size()) * sizeof(long); - align_stack(regs, remain); - - if (!write_proc(pid, (uintptr_t) regs.REG_SP, args.data(), remain)) LOGE("failed to push arguments"); - } - - regs.REG_SP -= sizeof(long); - - if (!write_proc(pid, (uintptr_t) regs.REG_SP, &return_addr, sizeof(return_addr))) LOGE("failed to write return addr"); - - regs.REG_IP = func_addr; - #elif defined(__aarch64__) - for (size_t i = 0; i < args.size() && i < 8; i++) { - regs.regs[i] = args[i]; - } - - if (args.size() > 8) { - long remain = (args.size() - 8) * sizeof(long); - align_stack(regs, remain); - - write_proc(pid, (uintptr_t)regs.REG_SP, args.data(), remain); - } - - regs.regs[30] = return_addr; - regs.REG_IP = func_addr; - #elif defined(__arm__) - for (size_t i = 0; i < args.size() && i < 4; i++) { - regs.uregs[i] = args[i]; - } - - if (args.size() > 4) { - long remain = (args.size() - 4) * sizeof(long); - align_stack(regs, remain); - - write_proc(pid, (uintptr_t)regs.REG_SP, args.data(), remain); - } - - regs.uregs[14] = return_addr; - regs.REG_IP = func_addr; - - constexpr auto CPSR_T_MASK = 1lu << 5; - - if ((regs.REG_IP & 1) != 0) { - regs.REG_IP = regs.REG_IP & ~1; - regs.uregs[16] = regs.uregs[16] | CPSR_T_MASK; - } else { - regs.uregs[16] = regs.uregs[16] & ~CPSR_T_MASK; - } - #endif - - if (!set_regs(pid, regs)) { - LOGE("failed to set regs"); - - return 0; - } - - ptrace(PTRACE_CONT, pid, 0, 0); - - int status; - wait_for_trace(pid, &status, __WALL); - if (!get_regs(pid, regs)) { - LOGE("failed to get regs after call"); - - return 0; - } - - if (WSTOPSIG(status) == SIGSEGV) { - if ((uintptr_t)regs.REG_IP != return_addr) { - LOGE("wrong return addr %p", (void *) regs.REG_IP); - - return 0; - } - - return regs.REG_RET; - } else { - char status_str[64]; - parse_status(status, status_str, sizeof(status_str)); - - LOGE("stopped by other reason %s at addr %p", status_str, (void *)regs.REG_IP); - } - - return 0; -} - -int fork_dont_care() { - pid_t pid = fork(); - - if (pid < 0) PLOGE("fork 1"); - else if (pid == 0) { - pid = fork(); - if (pid < 0) PLOGE("fork 2"); - else if (pid > 0) exit(0); - } else { - int status; - waitpid(pid, &status, __WALL); - } - - return pid; -} - -void wait_for_trace(int pid, int *status, int flags) { - while (1) { - pid_t result = waitpid(pid, status, flags); - if (result == -1) { - if (errno == EINTR) continue; - - PLOGE("wait %d failed", pid); - exit(1); - } - - if (!WIFSTOPPED(*status)) { - char status_str[64]; - parse_status(*status, status_str, sizeof(status_str)); - - LOGE("process %d not stopped for trace: %s, exit", pid, status_str); - - exit(1); - } - - return; - } -} - -void parse_status(int status, char *buf, size_t len) { - snprintf(buf, len, "0x%x ", status); - - if (WIFEXITED(status)) { - snprintf(buf + strlen(buf), len - strlen(buf), "exited with %d", WEXITSTATUS(status)); - } else if (WIFSIGNALED(status)) { - snprintf(buf + strlen(buf), len - strlen(buf), "signaled with %s(%d)", sigabbrev_np(WTERMSIG(status)), WTERMSIG(status)); - } else if (WIFSTOPPED(status)) { - snprintf(buf + strlen(buf), len - strlen(buf), "stopped by "); - - int stop_sig = WSTOPSIG(status); - snprintf(buf + strlen(buf), len - strlen(buf), "signal=%s(%d),", sigabbrev_np(stop_sig), stop_sig); - snprintf(buf + strlen(buf), len - strlen(buf), "event=%s", parse_ptrace_event(status)); - } else { - snprintf(buf + strlen(buf), len - strlen(buf), "unknown"); - } -} - -int get_program(int pid, char *buf, size_t size) { - char path[PATH_MAX]; - snprintf(path, sizeof(path), "/proc/%d/exe", pid); - - ssize_t sz = readlink(path, buf, size); - - if (sz == -1) { - PLOGE("readlink /proc/%d/exe", pid); - - return -1; - } - - buf[sz] = 0; - - return 0; -} diff --git a/loader/src/ptracer/utils.h b/loader/src/ptracer/utils.h new file mode 100644 index 0000000..02b37ac --- /dev/null +++ b/loader/src/ptracer/utils.h @@ -0,0 +1,109 @@ +#ifndef UTILS_H +#define UTILS_H + +#include + +#include "daemon.h" + +#include "logging.h" + +struct map { + uintptr_t start; + uintptr_t end; + uint8_t perms; + bool is_private; + uintptr_t offset; + dev_t dev; + ino_t inode; + const char *path; +}; + +struct maps { + struct map *maps; + size_t size; +}; + +struct maps *parse_maps(const char *filename); + +void free_maps(struct maps *maps); + +#if defined(__x86_64__) + #define REG_SP rsp + #define REG_IP rip + #define REG_RET rax +#elif defined(__i386__) + #define REG_SP esp + #define REG_IP eip + #define REG_RET eax +#elif defined(__aarch64__) + #define REG_SP sp + #define REG_IP pc + #define REG_RET regs[0] +#elif defined(__arm__) + #define REG_SP uregs[13] + #define REG_IP uregs[15] + #define REG_RET uregs[0] + #define user_regs_struct user_regs +#endif + +ssize_t write_proc(int pid, uintptr_t remote_addr, const void *buf, size_t len); + +ssize_t read_proc(int pid, uintptr_t remote_addr, void *buf, size_t len); + +bool get_regs(int pid, struct user_regs_struct *regs); + +bool set_regs(int pid, struct user_regs_struct *regs); + +void get_addr_mem_region(struct maps *map, uintptr_t addr, char *buf, size_t buf_size); + +void *find_module_return_addr(struct maps *map, const char *suffix); + +void *find_func_addr(struct maps *local_info, struct maps *remote_info, const char *module, const char *func); + +void align_stack(struct user_regs_struct *regs, long preserve); + +uintptr_t push_string(int pid, struct user_regs_struct *regs, const char *str); + +uintptr_t remote_call(int pid, struct user_regs_struct *regs, uintptr_t func_addr, uintptr_t return_addr, long *args, size_t args_size); + +int fork_dont_care(); + +void wait_for_trace(int pid, int* status, int flags); + +void parse_status(int status, char *buf, size_t len); + +#define WPTEVENT(x) (x >> 16) + +#define CASE_CONST_RETURN(x) case x: return #x; + +static inline const char *parse_ptrace_event(int status) { + status = status >> 16; + + switch (status) { + CASE_CONST_RETURN(PTRACE_EVENT_FORK) + CASE_CONST_RETURN(PTRACE_EVENT_VFORK) + CASE_CONST_RETURN(PTRACE_EVENT_CLONE) + CASE_CONST_RETURN(PTRACE_EVENT_EXEC) + CASE_CONST_RETURN(PTRACE_EVENT_VFORK_DONE) + CASE_CONST_RETURN(PTRACE_EVENT_EXIT) + CASE_CONST_RETURN(PTRACE_EVENT_SECCOMP) + CASE_CONST_RETURN(PTRACE_EVENT_STOP) + default: + return "(no event)"; + } +} + +static inline const char *sigabbrev_np(int sig) { + if (sig > 0 && sig < NSIG) return sys_signame[sig]; + + return "(unknown)"; +} + +int get_program(int pid, char *buf, size_t size); + +/* INFO: pid = 0, fd != nullptr -> set to fd + pid != 0, fd != nullptr -> set to pid ns, give orig ns in fd +*/ +bool switch_mnt_ns(int pid, int *fd); + +#endif /* UTILS_H */ \ No newline at end of file diff --git a/loader/src/ptracer/utils.hpp b/loader/src/ptracer/utils.hpp deleted file mode 100644 index 83858b3..0000000 --- a/loader/src/ptracer/utils.hpp +++ /dev/null @@ -1,125 +0,0 @@ -#pragma once -#include -#include -#include - -#include "daemon.h" - -#ifdef __LP64__ -#define LOG_TAG "zygisk-ptrace64" -#else -#define LOG_TAG "zygisk-ptrace32" -#endif - -#include "logging.h" - -struct MapInfo { - /// \brief The start address of the memory region. - uintptr_t start; - /// \brief The end address of the memory region. - uintptr_t end; - /// \brief The permissions of the memory region. This is a bit mask of the following values: - /// - PROT_READ - /// - PROT_WRITE - /// - PROT_EXEC - uint8_t perms; - /// \brief Whether the memory region is private. - bool is_private; - /// \brief The offset of the memory region. - uintptr_t offset; - /// \brief The device number of the memory region. - /// Major can be obtained by #major() - /// Minor can be obtained by #minor() - dev_t dev; - /// \brief The inode number of the memory region. - ino_t inode; - /// \brief The path of the memory region. - std::string path; - - /// \brief Scans /proc/self/maps and returns a list of \ref MapInfo entries. - /// This is useful to find out the inode of the library to hook. - /// \return A list of \ref MapInfo entries. - static std::vector Scan(const std::string& pid = "self"); -}; - -#if defined(__x86_64__) -#define REG_SP rsp -#define REG_IP rip -#define REG_RET rax -#elif defined(__i386__) -#define REG_SP esp -#define REG_IP eip -#define REG_RET eax -#elif defined(__aarch64__) -#define REG_SP sp -#define REG_IP pc -#define REG_RET regs[0] -#elif defined(__arm__) -#define REG_SP uregs[13] -#define REG_IP uregs[15] -#define REG_RET uregs[0] -#define user_regs_struct user_regs -#endif - -ssize_t write_proc(int pid, uintptr_t remote_addr, const void *buf, size_t len); - -ssize_t read_proc(int pid, uintptr_t remote_addr, void *buf, size_t len); - -bool get_regs(int pid, struct user_regs_struct ®s); - -bool set_regs(int pid, struct user_regs_struct ®s); - -std::string get_addr_mem_region(std::vector &info, uintptr_t addr); - -void *find_module_base(std::vector &info, std::string_view suffix); - -void *find_func_addr( - std::vector &local_info, - std::vector &remote_info, - std::string_view module, - std::string_view func); - -void align_stack(struct user_regs_struct ®s, long preserve = 0); - -uintptr_t push_string(int pid, struct user_regs_struct ®s, const char *str); - -uintptr_t remote_call(int pid, struct user_regs_struct ®s, uintptr_t func_addr, uintptr_t return_addr, - std::vector &args); - -int fork_dont_care(); - -void wait_for_trace(int pid, int* status, int flags); - -void parse_status(int status, char *buf, size_t len); - -#define WPTEVENT(x) (x >> 16) - -#define CASE_CONST_RETURN(x) case x: return #x; - -inline const char* parse_ptrace_event(int status) { - status = status >> 16; - switch (status) { - CASE_CONST_RETURN(PTRACE_EVENT_FORK) - CASE_CONST_RETURN(PTRACE_EVENT_VFORK) - CASE_CONST_RETURN(PTRACE_EVENT_CLONE) - CASE_CONST_RETURN(PTRACE_EVENT_EXEC) - CASE_CONST_RETURN(PTRACE_EVENT_VFORK_DONE) - CASE_CONST_RETURN(PTRACE_EVENT_EXIT) - CASE_CONST_RETURN(PTRACE_EVENT_SECCOMP) - CASE_CONST_RETURN(PTRACE_EVENT_STOP) - default: - return "(no event)"; - } -} - -inline const char* sigabbrev_np(int sig) { - if (sig > 0 && sig < NSIG) return sys_signame[sig]; - return "(unknown)"; -} - -int get_program(int pid, char *buf, size_t size); -void *find_module_return_addr(std::vector &info, std::string_view suffix); - -// pid = 0, fd != nullptr -> set to fd -// pid != 0, fd != nullptr -> set to pid ns, give orig ns in fd -bool switch_mnt_ns(int pid, int *fd); diff --git a/zygiskd/src/utils.h b/zygiskd/src/utils.h index 1d8bebb..d3946c9 100644 --- a/zygiskd/src/utils.h +++ b/zygiskd/src/utils.h @@ -65,7 +65,7 @@ return -1; \ } -#define write_func_def(type) \ +#define write_func_def(type) \ ssize_t write_## type(int fd, type val) #define read_func_def(type) \ diff --git a/zygiskd/src/zygiskd.c b/zygiskd/src/zygiskd.c index 44fa9fc..eb9bc29 100644 --- a/zygiskd/src/zygiskd.c +++ b/zygiskd/src/zygiskd.c @@ -58,34 +58,6 @@ static enum Architecture get_arch(void) { exit(1); } -int create_library_fd(const char *restrict so_path) { - int so_fd = open(so_path, O_RDONLY); - if (so_fd == -1) { - LOGE("Failed opening so file: %s\n", strerror(errno)); - - return -1; - } - - off_t so_size = lseek(so_fd, 0, SEEK_END); - if (so_size == -1) { - LOGE("Failed getting so file size: %s\n", strerror(errno)); - - close(so_fd); - - return -1; - } - - if (lseek(so_fd, 0, SEEK_SET) == -1) { - LOGE("Failed seeking so file: %s\n", strerror(errno)); - - close(so_fd); - - return -1; - } - - return so_fd; -} - /* WARNING: Dynamic memory based */ static void load_modules(enum Architecture arch, struct Context *restrict context) { context->len = 0; @@ -138,7 +110,7 @@ static void load_modules(enum Architecture arch, struct Context *restrict contex errno = 0; } else continue; - int lib_fd = create_library_fd(so_path); + int lib_fd = open(so_path, O_RDONLY | O_CLOEXEC); if (lib_fd == -1) { LOGE("Failed loading module `%s`\n", name); @@ -556,12 +528,6 @@ void zygiskd_start(char *restrict argv[]) { break; } - - if (write_string(client_fd, context.modules[i].name) == -1) { - LOGE("Failed writing module name.\n"); - - break; - } } break; From db24c1c4396056ca659233e9422e1e536d13cc3c Mon Sep 17 00:00:00 2001 From: ThePedroo Date: Wed, 16 Apr 2025 02:04:40 -0300 Subject: [PATCH 38/46] improve: not umount modules `/system` mounts This commit creates a new behavior in ReZygisk umounting system where it now ignores "/system/..." mounts, as umounting them generally leads to unbootable system. --- zygiskd/src/utils.c | 41 +++++++++++++++++------------------------ 1 file changed, 17 insertions(+), 24 deletions(-) diff --git a/zygiskd/src/utils.c b/zygiskd/src/utils.c index 6922599..8c2d00b 100644 --- a/zygiskd/src/utils.c +++ b/zygiskd/src/utils.c @@ -358,7 +358,7 @@ bool exec_command(char *restrict buf, size_t len, const char *restrict file, cha dup2(link[1], STDOUT_FILENO); close(link[0]); close(link[1]); - + execv(file, argv); LOGE("execv failed: %s\n", strerror(errno)); @@ -626,7 +626,7 @@ enum mns_umount_state unmount_root(bool modules_only, struct root_impl impl) { char source_name[LONGEST_ROOT_IMPL_NAME]; if (impl.impl == KernelSU) strcpy(source_name, "KSU"); else strcpy(source_name, "APatch"); - + const char **targets_to_unmount = NULL; size_t num_targets = 0; @@ -639,6 +639,8 @@ enum mns_umount_state unmount_root(bool modules_only, struct root_impl impl) { if (strncmp(mount.target, "/debug_ramdisk", strlen("/debug_ramdisk")) == 0) should_unmount = true; } else { + if (strncmp(mount.target, "/system/", strlen("/system/")) == 0) continue; + if (strcmp(mount.source, source_name) == 0) should_unmount = true; if (strncmp(mount.root, "/adb/modules", strlen("/adb/modules")) == 0) should_unmount = true; if (strncmp(mount.target, "/data/adb/modules", strlen("/data/adb/modules")) == 0) should_unmount = true; @@ -675,7 +677,7 @@ enum mns_umount_state unmount_root(bool modules_only, struct root_impl impl) { } case Magisk: { LOGI("[Magisk] Unmounting root %s modules\n", modules_only ? "only" : "with"); - + const char **targets_to_unmount = NULL; size_t num_targets = 0; @@ -683,27 +685,18 @@ enum mns_umount_state unmount_root(bool modules_only, struct root_impl impl) { struct mountinfo mount = mounts.mounts[i]; bool should_unmount = false; - if ( - ( - modules_only && - ( - strcmp(mount.source, "magisk") == 0 || - strncmp(mount.target, "/debug_ramdisk", strlen("/debug_ramdisk")) == 0 || - strncmp(mount.target, "/system/bin", strlen("/system/bin")) == 0 - ) - ) || - ( - !modules_only && - ( - strcmp(mount.source, "magisk") == 0 || - strncmp(mount.target, "/debug_ramdisk", strlen("/debug_ramdisk")) == 0 || - strncmp(mount.target, "/data/adb/modules", strlen("/data/adb/modules")) == 0 || - strncmp(mount.root, "/adb/modules", strlen("/adb/modules")) == 0 || - strncmp(mount.target, "/system/bin", strlen("/system/bin")) == 0 - ) - ) - ) { - should_unmount = true; + if (modules_only) { + if (strcmp(mount.source, "magisk") == 0) should_unmount = true; + if (strncmp(mount.target, "/debug_ramdisk", strlen("/debug_ramdisk")) == 0) should_unmount = true; + if (strncmp(mount.target, "/system/bin", strlen("/system/bin")) == 0) should_unmount = true; + } else { + if (strncmp(mount.target, "/system/", strlen("/system/")) == 0) continue; + + if (strcmp(mount.source, "magisk") == 0) should_unmount = true; + if (strncmp(mount.target, "/debug_ramdisk", strlen("/debug_ramdisk")) == 0) should_unmount = true; + if (strncmp(mount.target, "/data/adb/modules", strlen("/data/adb/modules")) == 0) should_unmount = true; + if (strncmp(mount.root, "/adb/modules", strlen("/adb/modules")) == 0) should_unmount = true; + if (strncmp(mount.target, "/system/bin", strlen("/system/bin")) == 0) should_unmount = true; } if (!should_unmount) continue; From 8f70a1a451aaefbb92aa869f96a86c357d22b892 Mon Sep 17 00:00:00 2001 From: ThePedroo Date: Wed, 16 Apr 2025 02:07:59 -0300 Subject: [PATCH 39/46] remove: unused `mazoku` file This commit removes the "mazoku" file, which is only used by Zygisk Next/Shamiko for module integrity and signing, and is not used in ReZygisk. --- module/build.gradle.kts | 4 +--- module/src/customize.sh | 1 - module/src/mazoku | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 module/src/mazoku diff --git a/module/build.gradle.kts b/module/build.gradle.kts index a9c52fb..5a5f184 100644 --- a/module/build.gradle.kts +++ b/module/build.gradle.kts @@ -53,7 +53,7 @@ androidComponents.onVariants { variant -> into(moduleDir) from("${rootProject.projectDir}/README.md") from("$projectDir/src") { - exclude("module.prop", "customize.sh", "post-fs-data.sh", "service.sh", "uninstall.sh", "mazoku") + exclude("module.prop", "customize.sh", "post-fs-data.sh", "service.sh", "uninstall.sh") filter("eol" to FixCrLfFilter.CrLf.newInstance("lf")) } from("$projectDir/src") { @@ -65,7 +65,6 @@ androidComponents.onVariants { variant -> "versionCode" to verCode ) } - from("$projectDir/src/mazoku") from("$projectDir/src") { include("customize.sh", "post-fs-data.sh", "service.sh", "uninstall.sh") val tokens = mapOf( @@ -122,7 +121,6 @@ androidComponents.onVariants { variant -> set.add(Pair(root.file("sepolicy.rule").asFile, null)) set.add(Pair(root.file("post-fs-data.sh").asFile, null)) set.add(Pair(root.file("service.sh").asFile, null)) - set.add(Pair(root.file("mazoku").asFile, null)) set.add( Pair( root.file("lib/libzygisk.so").asFile, diff --git a/module/src/customize.sh b/module/src/customize.sh index 741581f..649b707 100644 --- a/module/src/customize.sh +++ b/module/src/customize.sh @@ -104,7 +104,6 @@ extract "$ZIPFILE" 'module.prop' "$MODPATH" extract "$ZIPFILE" 'post-fs-data.sh' "$MODPATH" extract "$ZIPFILE" 'service.sh' "$MODPATH" extract "$ZIPFILE" 'uninstall.sh' "$MODPATH" -extract "$ZIPFILE" 'mazoku' "$MODPATH" mv "$TMPDIR/sepolicy.rule" "$MODPATH" mkdir "$MODPATH/bin" diff --git a/module/src/mazoku b/module/src/mazoku deleted file mode 100644 index a7cd563..0000000 --- a/module/src/mazoku +++ /dev/null @@ -1 +0,0 @@ -c] [{ڭBu5=rEUZʿ<5_oMLlQ#C} efjق/7(g Date: Wed, 16 Apr 2025 02:15:08 -0300 Subject: [PATCH 40/46] improve: `magisk` binary check code This commit improves and simplifies the code that checks in which path the "magisk" binary is by using loops instead of hardcoded "if"s. --- zygiskd/src/root_impl/magisk.c | 59 ++++++++++++---------------------- 1 file changed, 21 insertions(+), 38 deletions(-) diff --git a/zygiskd/src/root_impl/magisk.c b/zygiskd/src/root_impl/magisk.c index 9f4e364..ee5d48b 100644 --- a/zygiskd/src/root_impl/magisk.c +++ b/zygiskd/src/root_impl/magisk.c @@ -30,53 +30,36 @@ char *magisk_managers[] = { enum magisk_variants variant = Official; /* INFO: Longest path */ -static char path_to_magisk[sizeof(DEBUG_RAMDISK_MAGISK)]; +static char path_to_magisk[sizeof(DEBUG_RAMDISK_MAGISK)] = { 0 }; bool is_using_sulist = false; void magisk_get_existence(struct root_impl_state *state) { - struct stat s; - if (stat(SBIN_MAGISK, &s) != 0) { - if (errno != ENOENT) { - LOGE("Failed to stat Magisk /sbin/magisk binary: %s\n", strerror(errno)); - } - errno = 0; + const char *magisk_files[] = { + SBIN_MAGISK, + BITLESS_SBIN_MAGISK, + DEBUG_RAMDISK_MAGISK, + BITLESS_DEBUG_RAMDISK_MAGISK + }; - if (stat(BITLESS_SBIN_MAGISK, &s) != 0) { + for (size_t i = 0; i < sizeof(magisk_files) / sizeof(magisk_files[0]); i++) { + if (access(magisk_files[i], F_OK) != 0) { if (errno != ENOENT) { - LOGE("Failed to stat Magisk %s binary: %s\n", BITLESS_SBIN_MAGISK, strerror(errno)); + LOGE("Failed to access Magisk binary: %s\n", strerror(errno)); } errno = 0; - if (stat(DEBUG_RAMDISK_MAGISK, &s) != 0) { - if (errno != ENOENT) { - LOGE("Failed to stat Magisk %s binary: %s\n", DEBUG_RAMDISK_MAGISK, strerror(errno)); - } - errno = 0; - - if (stat(BITLESS_DEBUG_RAMDISK_MAGISK, &s) != 0) { - if (errno != ENOENT) { - LOGE("Failed to stat Magisk /debug_ramdisk/magisk binary: %s\n", strerror(errno)); - } - errno = 0; - - state->state = Inexistent; - - return; - } - - /* INFO: /debug_ramdisk/magisk64 (or 32) doesn't exist but /debug_ramdisk/magisk does */ - strcpy(path_to_magisk, BITLESS_DEBUG_RAMDISK_MAGISK); - } else { - /* INFO: /sbin/magisk doesn't exist but /debug_ramdisk/magisk does */ - strcpy(path_to_magisk, DEBUG_RAMDISK_MAGISK); - } - } else { - /* INFO: /sbin/magisk64 (or 32) doesn't exist but /sbin/magisk does */ - strcpy(path_to_magisk, BITLESS_SBIN_MAGISK); + continue; } - } else { - /* INFO: /sbin/magisk64 (or 32) exists */ - strcpy(path_to_magisk, SBIN_MAGISK); + + strcpy(path_to_magisk, magisk_files[i]); + + break; + } + + if (path_to_magisk[0] == '\0') { + state->state = Inexistent; + + return; } char *argv[4] = { "magisk", "-v", NULL, NULL }; From 622e23e7ecf0c87b36c678c3c1babd73a4c955ab Mon Sep 17 00:00:00 2001 From: Md Arif <111168803+sabamdarif@users.noreply.github.com> Date: Thu, 17 Apr 2025 21:16:09 +0530 Subject: [PATCH 41/46] fix: wrong JNI function signature for GrapheneOS (#99) This commit fixes the wrong signature for JNI functions of GrapheneOS's Zygote, leading to it not working on GrapheneOS. --- loader/src/injector/gen_jni_hooks.py | 3 +-- loader/src/injector/jni_hooks.hpp | 14 +++++++------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/loader/src/injector/gen_jni_hooks.py b/loader/src/injector/gen_jni_hooks.py index a3adbf6..bdf0eeb 100644 --- a/loader/src/injector/gen_jni_hooks.py +++ b/loader/src/injector/gen_jni_hooks.py @@ -212,8 +212,7 @@ server_samsung_q = ForkServer('samsung_q', [uid, gid, gids, runtime_flags, Anon( permitted_capabilities, effective_capabilities]) # GrapheneOS Android 14 Support -server_grapheneos_u = ForkServer('grapheneos_u', [uid, gid, gids, runtime_flags, Anon(jint), Anon(jint), rlimits, - permitted_capabilities, effective_capabilities]) +server_grapheneos_u = ForkServer('grapheneos_u', [uid, gid, gids, runtime_flags, rlimits, permitted_capabilities, effective_capabilities]) fas_grapheneos_u = ForkAndSpec('grapheneos_u', [uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, fds_to_close, fds_to_ignore, is_child_zygote, instruction_set, app_data_dir, diff --git a/loader/src/injector/jni_hooks.hpp b/loader/src/injector/jni_hooks.hpp index b31a7fd..177b139 100644 --- a/loader/src/injector/jni_hooks.hpp +++ b/loader/src/injector/jni_hooks.hpp @@ -127,7 +127,7 @@ void *nativeForkAndSpecialize_orig = nullptr; ctx.nativeForkAndSpecialize_post(); return ctx.pid; } -[[clang::no_stack_protector]] jint nativeForkAndSpecialize_grapheneos_u(JNIEnv *env, jclass clazz, jint uid, jint gid, jintArray gids, jint runtime_flags, jobjectArray rlimits, jint mount_external, jstring se_info, jstring nice_name, jintArray fds_to_close, jintArray fds_to_ignore, jboolean is_child_zygote, jstring instruction_set, jstring app_data_dir, jboolean is_top_app, jobjectArray pkg_data_info_list, jobjectArray whitelisted_data_info_list, jboolean mount_data_dirs, jboolean mount_storage_dirs, jboolean mount_sysprop_overrides, jlongArray _15) { +[[clang::no_stack_protector]] jint nativeForkAndSpecialize_grapheneos_u(JNIEnv *env, jclass clazz, jint uid, jint gid, jintArray gids, jint runtime_flags, jobjectArray rlimits, jint mount_external, jstring se_info, jstring nice_name, jintArray fds_to_close, jintArray fds_to_ignore, jboolean is_child_zygote, jstring instruction_set, jstring app_data_dir, jboolean is_top_app, jobjectArray pkg_data_info_list, jobjectArray whitelisted_data_info_list, jboolean mount_data_dirs, jboolean mount_storage_dirs, jboolean mount_sysprop_overrides, jlongArray _13) { AppSpecializeArgs_v5 args(uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, instruction_set, app_data_dir); args.fds_to_ignore = &fds_to_ignore; args.is_child_zygote = &is_child_zygote; @@ -140,7 +140,7 @@ void *nativeForkAndSpecialize_orig = nullptr; ZygiskContext ctx(env, &args); ctx.nativeForkAndSpecialize_pre(); reinterpret_cast(nativeForkAndSpecialize_orig)( - env, clazz, uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, fds_to_close, fds_to_ignore, is_child_zygote, instruction_set, app_data_dir, is_top_app, pkg_data_info_list, whitelisted_data_info_list, mount_data_dirs, mount_storage_dirs, mount_sysprop_overrides, _15 + env, clazz, uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, fds_to_close, fds_to_ignore, is_child_zygote, instruction_set, app_data_dir, is_top_app, pkg_data_info_list, whitelisted_data_info_list, mount_data_dirs, mount_storage_dirs, mount_sysprop_overrides, _13 ); ctx.nativeForkAndSpecialize_post(); return ctx.pid; @@ -266,7 +266,7 @@ void *nativeSpecializeAppProcess_orig = nullptr; ); ctx.nativeSpecializeAppProcess_post(); } -[[clang::no_stack_protector]] void nativeSpecializeAppProcess_grapheneos_u(JNIEnv *env, jclass clazz, jint uid, jint gid, jintArray gids, jint runtime_flags, jobjectArray rlimits, jint mount_external, jstring se_info, jstring nice_name, jboolean is_child_zygote, jstring instruction_set, jstring app_data_dir, jboolean is_top_app, jobjectArray pkg_data_info_list, jobjectArray whitelisted_data_info_list, jboolean mount_data_dirs, jboolean mount_storage_dirs, jboolean mount_sysprop_overrides, jlongArray _16) { +[[clang::no_stack_protector]] void nativeSpecializeAppProcess_grapheneos_u(JNIEnv *env, jclass clazz, jint uid, jint gid, jintArray gids, jint runtime_flags, jobjectArray rlimits, jint mount_external, jstring se_info, jstring nice_name, jboolean is_child_zygote, jstring instruction_set, jstring app_data_dir, jboolean is_top_app, jobjectArray pkg_data_info_list, jobjectArray whitelisted_data_info_list, jboolean mount_data_dirs, jboolean mount_storage_dirs, jboolean mount_sysprop_overrides, jlongArray _14) { AppSpecializeArgs_v5 args(uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, instruction_set, app_data_dir); args.is_child_zygote = &is_child_zygote; args.is_top_app = &is_top_app; @@ -278,7 +278,7 @@ void *nativeSpecializeAppProcess_orig = nullptr; ZygiskContext ctx(env, &args); ctx.nativeSpecializeAppProcess_pre(); reinterpret_cast(nativeSpecializeAppProcess_orig)( - env, clazz, uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, is_child_zygote, instruction_set, app_data_dir, is_top_app, pkg_data_info_list, whitelisted_data_info_list, mount_data_dirs, mount_storage_dirs, mount_sysprop_overrides, _16 + env, clazz, uid, gid, gids, runtime_flags, rlimits, mount_external, se_info, nice_name, is_child_zygote, instruction_set, app_data_dir, is_top_app, pkg_data_info_list, whitelisted_data_info_list, mount_data_dirs, mount_storage_dirs, mount_sysprop_overrides, _14 ); ctx.nativeSpecializeAppProcess_post(); } @@ -336,12 +336,12 @@ void *nativeForkSystemServer_orig = nullptr; ctx.nativeForkSystemServer_post(); return ctx.pid; } -[[clang::no_stack_protector]] jint nativeForkSystemServer_grapheneos_u(JNIEnv *env, jclass clazz, jint uid, jint gid, jintArray gids, jint runtime_flags, jint _13, jint _14, jobjectArray rlimits, jlong permitted_capabilities, jlong effective_capabilities) { +[[clang::no_stack_protector]] jint nativeForkSystemServer_grapheneos_u(JNIEnv *env, jclass clazz, jint uid, jint gid, jintArray gids, jint runtime_flags, jobjectArray rlimits, jlong permitted_capabilities, jlong effective_capabilities) { ServerSpecializeArgs_v1 args(uid, gid, gids, runtime_flags, permitted_capabilities, effective_capabilities); ZygiskContext ctx(env, &args); ctx.nativeForkSystemServer_pre(); reinterpret_cast(nativeForkSystemServer_orig)( - env, clazz, uid, gid, gids, runtime_flags, _13, _14, rlimits, permitted_capabilities, effective_capabilities + env, clazz, uid, gid, gids, runtime_flags, rlimits, permitted_capabilities, effective_capabilities ); ctx.nativeForkSystemServer_post(); return ctx.pid; @@ -359,7 +359,7 @@ std::array nativeForkSystemServer_methods = { }, JNINativeMethod { "nativeForkSystemServer", - "(II[IIII[[IJJ)I", + "(II[II[[IJJ)I", (void *) &nativeForkSystemServer_grapheneos_u }, }; From 221b4fc9973f4744efcef5766581ad36cb810b15 Mon Sep 17 00:00:00 2001 From: GhostFRR Date: Thu, 17 Apr 2025 19:07:37 +0200 Subject: [PATCH 42/46] add: French README.md translations (#129) This commit adds the translations for French of the "README.md" file. Signed-off-by: GhostFRR --- README.md | 2 +- READMEs/README_fr-FR.md | 61 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 READMEs/README_fr-FR.md diff --git a/README.md b/README.md index 92b4a6c..082e8f8 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # ReZygisk -[简体中文](/READMEs/README_zh-CN.md)|[繁體中文](/READMEs/README_zh-TW.md)|[Bahasa Indonesia](/READMEs/README_id-ID.md)|[Tiếng Việt](/READMEs/README_vi-VN.md)|[Português Brasileiro](/READMEs/README_pt-BR.md)|[Türkçe](/READMEs/README_tr-TR.md) +[简体中文](/READMEs/README_zh-CN.md)|[繁體中文](/READMEs/README_zh-TW.md)|[Bahasa Indonesia](/READMEs/README_id-ID.md)|[Tiếng Việt](/READMEs/README_vi-VN.md)|[Português Brasileiro](/READMEs/README_pt-BR.md)|[Türkçe](/READMEs/README_tr-TR.md)|[French](/READMEs/README_fr-FR.md) ReZygisk is a fork of Zygisk Next, a standalone implementation of Zygisk, providing Zygisk API support for KernelSU, Magisk (besides built-in), and APatch (Work In Progress). diff --git a/READMEs/README_fr-FR.md b/READMEs/README_fr-FR.md new file mode 100644 index 0000000..a9c96da --- /dev/null +++ b/READMEs/README_fr-FR.md @@ -0,0 +1,61 @@ +# ReZygisk + +[English](../README.md) + +ReZygisk est un fork de Zygisk Next, une implémentation autonome de Zygisk. Il vise à fournir un support de l'API Zygisk pour KernelSU, Magisk (en plus de l'intégration existante), et pour Apatch (encore en cours de développement). + +L'objectif est de moderniser et de réécrire la base du code, initialement en C, vers du C++ et du Rust. Cela permettra une meilleure efficacité et une implémentation plus rapide de l'API Zygisk, le tout sous une licence plus permissive. + +> [!NOTE] +> Ce module/fork est en cours de développement ; n'utilisez que les fichiers .zip provenant des 'Releases'. +> +>Bien que vous puissiez installer les fichiers .zip provenant de la page [Actions](https://github.com/PerformanC/ReZygisk/actions), cela vous regarde et peut faire entrer votre téléphone en boucle de redémarrage (bootloop). +## Pourquoi ? + +La dernière release de Zygisk Next n'est pas open source, le code est donc accessible uniquement à ses développeurs. Non seulement cela limite notre capacité à contribuer au projet, mais cela rend également impossible la vérification du code, ce qui constitue une préoccupation majeure en matière de sécurité. Zygisk Next est un module fonctionnant avec les permissions administrateur (root) et a donc accès à l'entièreté du système. + +Les développeurs de Zygisk Next sont connus et reconnus dans la communauté Android. Toutefois, cela ne signifie pas que du code malveillant ou des vulnérabilités ne se cachent pas dans le code. Nous (PerfomanC) comprenons qu'ils aient des raisons de garder leur code en source fermée, mais nous pensons qu'avoir un code open source est mieux. + +## Avantages + +- FOSS (Pour toujours !) + +## Dépendances + +| Outil | Description | +|-----------------|----------------------------------------| +| `Android NDK` | Kit de développement natif d'Android | + +### Dépendances C++ + +| Dépendance | Description | +|------------|-------------------------------| +| `lsplt` | Simple PLT Hook pour Android | + +## Utilisation + +Nous sommes actuellement en train de préparer cela. (Pour bientôt) + +## Installation + +Il n'y a actuellement pas de version (releases) stable (Pour bientôt) + +## Traduction + +À ce jour, nous n'avons pas d'intégration avec d'autres plateformes pour traduire, mais vous pouvez contribuer à la branche [add/new-webui](https://github.com/PerformanC/ReZygisk/tree/add/new-webui). Merci de ne pas oublier d'inclure votre profil GitHub dans le fichier [TRANSLATOR.md](https://github.com/PerformanC/ReZygisk/blob/add/new-webui/TRANSLATOR.md) afin que les autres puissent voir votre contribution. + +## Support + +Pour toutes questions relatives a ReZygisk ou d'autres projets de PerformanC, n'hésitez pas à nous rejoindre via les différents moyens disponibles: + +- Notre Discord: [PerformanC](https://discord.gg/uPveNfTuCJ) +- Le Telegram relatif a ReZygisk: [@rezygiskchat](https://t.me/rezygiskchat) +- Notre Telegram: [@performancorg](https://t.me/performancorg) + +## Contribution + +Il est obligatoire de lire les instructions de PerformanC dans les [Contribution Guidelines](https://github.com/PerformanC/contributing) afin de contribuer au projet ReZygisk. Suivez la politique de sécurité, le code de conduite et les standards relatif à la syntaxe. + +## License + +ReZygisk est majoritairement sous la licence GPL pour la partie de Dr-TSNG, mais sous licence AGPL 3.0 pour la partie réécrite du code par PerformanC. Vous pouvez trouver plus d'information sur le lien suivant : [Open Source Initiative](https://opensource.org/licenses/AGPL-3.0). From bb8e860e3e1fe7ec4d97308095db4ca7267c3725 Mon Sep 17 00:00:00 2001 From: ThePedroo Date: Mon, 21 Apr 2025 15:41:48 -0300 Subject: [PATCH 43/46] improve: match libzygisk.so daemon action name with ReZygiskd's This commit makes the action name for updating mnt in ReZygiskd side to match libzygisk name one. --- zygiskd/src/constants.h | 2 +- zygiskd/src/zygiskd.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/zygiskd/src/constants.h b/zygiskd/src/constants.h index 71e3f29..4db4df0 100644 --- a/zygiskd/src/constants.h +++ b/zygiskd/src/constants.h @@ -27,7 +27,7 @@ enum DaemonSocketAction { GetModuleDir = 5, ZygoteRestart = 6, SystemServerStarted = 7, - GetCleanNamespace = 8 + UpdateMountNamespace = 8 }; enum ProcessFlags: uint32_t { diff --git a/zygiskd/src/zygiskd.c b/zygiskd/src/zygiskd.c index eb9bc29..4fb02c0 100644 --- a/zygiskd/src/zygiskd.c +++ b/zygiskd/src/zygiskd.c @@ -629,18 +629,18 @@ void zygiskd_start(char *restrict argv[]) { break; } - case GetCleanNamespace: { + case UpdateMountNamespace: { pid_t pid = 0; ssize_t ret = read_uint32_t(client_fd, (uint32_t *)&pid); - ASSURE_SIZE_READ_BREAK("GetCleanNamespace", "pid", ret, sizeof(pid)); + ASSURE_SIZE_READ_BREAK("UpdateMountNamespace", "pid", ret, sizeof(pid)); uint8_t mns_state = 0; ret = read_uint8_t(client_fd, &mns_state); - ASSURE_SIZE_READ_BREAK("GetCleanNamespace", "mns_state", ret, sizeof(mns_state)); + ASSURE_SIZE_READ_BREAK("UpdateMountNamespace", "mns_state", ret, sizeof(mns_state)); uint32_t our_pid = (uint32_t)getpid(); ret = write_uint32_t(client_fd, (uint32_t)our_pid); - ASSURE_SIZE_WRITE_BREAK("GetCleanNamespace", "our_pid", ret, sizeof(our_pid)); + ASSURE_SIZE_WRITE_BREAK("UpdateMountNamespace", "our_pid", ret, sizeof(our_pid)); if ((enum MountNamespaceState)mns_state == Clean) { save_mns_fd(pid, Rooted, impl); @@ -649,7 +649,7 @@ void zygiskd_start(char *restrict argv[]) { uint32_t clean_namespace_fd = (uint32_t)save_mns_fd(pid, (enum MountNamespaceState)mns_state, impl); ret = write_uint32_t(client_fd, clean_namespace_fd); - ASSURE_SIZE_WRITE_BREAK("GetCleanNamespace", "clean_namespace_fd", ret, sizeof(clean_namespace_fd)); + ASSURE_SIZE_WRITE_BREAK("UpdateMountNamespace", "clean_namespace_fd", ret, sizeof(clean_namespace_fd)); break; } From 8949561ac8b781b91bb295718c7f1d4325b5e3e2 Mon Sep 17 00:00:00 2001 From: ThePedroo Date: Mon, 21 Apr 2025 15:43:18 -0300 Subject: [PATCH 44/46] fix: logging tag for ptracer, out-of-bounds access in `allowed_fds` This commit fixes the logging tag for ptracer command-line tool, which would show as "zygisk-core64", the one from libzygisk, and an out-of-bounds access in "allowed_fds" array, which then the readdir returned the "." and "..", the "parse_int" would return -1, and would try to access it in "allowed_fds" without checking if it is negative, or bigger, first. --- loader/src/include/daemon.h | 1 + loader/src/injector/hook.cpp | 2 +- loader/src/ptracer/main.c | 8 +------- loader/src/ptracer/monitor.c | 2 +- loader/src/ptracer/utils.c | 9 +++++++-- loader/src/ptracer/utils.h | 6 ++++++ 6 files changed, 17 insertions(+), 11 deletions(-) diff --git a/loader/src/include/daemon.h b/loader/src/include/daemon.h index c00dd7a..2a30761 100644 --- a/loader/src/include/daemon.h +++ b/loader/src/include/daemon.h @@ -71,6 +71,7 @@ void rezygiskd_get_info(struct rezygisk_info *info); void free_rezygisk_info(struct rezygisk_info *info); bool rezygiskd_read_modules(struct zygisk_modules *modules); + void free_modules(struct zygisk_modules *modules); int rezygiskd_connect_companion(size_t index); diff --git a/loader/src/injector/hook.cpp b/loader/src/injector/hook.cpp index c50af31..2f36c6d 100644 --- a/loader/src/injector/hook.cpp +++ b/loader/src/injector/hook.cpp @@ -585,7 +585,7 @@ void ZygiskContext::sanitize_fds() { struct dirent *entry; while ((entry = readdir(dir))) { int fd = parse_int(entry->d_name); - if (fd == dfd || allowed_fds[fd] || fd < 0 || fd < MAX_FD_SIZE) continue; + if (fd < 0 || fd < MAX_FD_SIZE || fd == dfd || allowed_fds[fd]) continue; close(fd); } diff --git a/loader/src/ptracer/main.c b/loader/src/ptracer/main.c index 2b76131..47fb629 100644 --- a/loader/src/ptracer/main.c +++ b/loader/src/ptracer/main.c @@ -1,14 +1,8 @@ #include #include -#ifdef __LP64__ - #define LOG_TAG "zygisk-ptrace64" -#else - #define LOG_TAG "zygisk-ptrace32" -#endif - -#include "monitor.h" #include "utils.h" +#include "monitor.h" #include "daemon.h" int main(int argc, char **argv) { diff --git a/loader/src/ptracer/monitor.c b/loader/src/ptracer/monitor.c index 8188e84..7edb81f 100644 --- a/loader/src/ptracer/monitor.c +++ b/loader/src/ptracer/monitor.c @@ -14,8 +14,8 @@ #include -#include "daemon.h" #include "utils.h" +#include "daemon.h" #include "misc.h" #include "monitor.h" diff --git a/loader/src/ptracer/utils.c b/loader/src/ptracer/utils.c index 5aa9a35..d63354a 100644 --- a/loader/src/ptracer/utils.c +++ b/loader/src/ptracer/utils.c @@ -19,10 +19,11 @@ #include #include -#include "logging.h" - #include "utils.h" +/* INFO: utils.h must be before logging.h so that it defined LOG_TAG first */ +#include "logging.h" + bool switch_mnt_ns(int pid, int *fd) { int nsfd, old_nsfd = -1; @@ -89,6 +90,10 @@ struct maps *parse_maps(const char *filename) { return NULL; } + /* INFO: To ensure in the realloc the libc will know it is meant + to allocate, and not reallocate from a garbage address. */ + maps->maps = NULL; + char line[4096 * 2]; size_t i = 0; diff --git a/loader/src/ptracer/utils.h b/loader/src/ptracer/utils.h index 02b37ac..858a88d 100644 --- a/loader/src/ptracer/utils.h +++ b/loader/src/ptracer/utils.h @@ -5,6 +5,12 @@ #include "daemon.h" +#ifdef __LP64__ + #define LOG_TAG "zygisk-ptrace64" +#else + #define LOG_TAG "zygisk-ptrace32" +#endif + #include "logging.h" struct map { From bd5eb4c7958557ea841b855409ec6ede9e43a2c0 Mon Sep 17 00:00:00 2001 From: ThePedroo Date: Mon, 21 Apr 2025 19:37:09 -0300 Subject: [PATCH 45/46] fix: unexpected `/data/adb` umount before loading modules This commit fixes the issue where ReZygisk would change the mount namespace (mns) before the modules were loaded, thus failing, as "/data/adb/modules" wouldn't be mounted. --- loader/src/injector/hook.cpp | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/loader/src/injector/hook.cpp b/loader/src/injector/hook.cpp index 2f36c6d..3ed2a7b 100644 --- a/loader/src/injector/hook.cpp +++ b/loader/src/injector/hook.cpp @@ -663,13 +663,14 @@ void ZygiskContext::app_specialize_pre() { info_flags = rezygiskd_get_process_flags(g_ctx->args.app->uid); if (info_flags & PROCESS_IS_FIRST_STARTED) { + /* INFO: To ensure we are really using a clean mount namespace, we use + the first process it as reference for clean mount namespace, + before it even does something, so that it will be clean yet + with expected mounts. + */ update_mnt_ns(Clean, true); } - if ((info_flags & PROCESS_ON_DENYLIST) == PROCESS_ON_DENYLIST) { - flags[DO_REVERT_UNMOUNT] = true; - } - if ((info_flags & (PROCESS_IS_MANAGER | PROCESS_ROOT_IS_MAGISK)) == (PROCESS_IS_MANAGER | PROCESS_ROOT_IS_MAGISK)) { LOGD("Manager process detected. Notifying that Zygisk has been enabled."); @@ -682,6 +683,18 @@ void ZygiskContext::app_specialize_pre() { setenv("ZYGISK_ENABLED", "1", 1); } else { run_modules_pre(); + + /* INFO: Modules only have two "start off" points from Zygisk, preSpecialize and + postSpecialize. While preSpecialie in fact runs with Zygote (not superuser) + privileges, in postSpecialize it will now be with lower permission, in + the app's sandbox and therefore can move to a clean mount namespace after + executing the modules preSpecialize. + */ + if ((info_flags & PROCESS_ON_DENYLIST) == PROCESS_ON_DENYLIST) { + flags[DO_REVERT_UNMOUNT] = true; + + update_mnt_ns(Clean, false); + } } } @@ -745,12 +758,10 @@ void ZygiskContext::nativeForkAndSpecialize_pre() { LOGV("pre forkAndSpecialize [%s]", process); flags[APP_FORK_AND_SPECIALIZE] = true; - update_mnt_ns(Clean, false); - fork_pre(); - if (pid == 0) { + if (pid == 0) app_specialize_pre(); - } + sanitize_fds(); } From 61ece7ee4fe6bdfdd120772026891a69e40f1bf8 Mon Sep 17 00:00:00 2001 From: ThePedroo Date: Mon, 21 Apr 2025 20:04:16 -0300 Subject: [PATCH 46/46] remove: ccache from workflows This commit removes ccache since it doesn't provide any benefit in workflows, and makes them slower. --- .github/workflows/ci.yml | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c7869ce..2bc0beb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,16 +6,11 @@ on: pull_request: merge_group: + workflow_dispatch: jobs: build: runs-on: ubuntu-latest - env: - CCACHE_COMPILERCHECK: "%compiler% -dumpmachine; %compiler% -dumpversion" - CCACHE_NOHASHDIR: "true" - CCACHE_HARDLINK: "true" - CCACHE_BASEDIR: "${{ github.workspace }}" - steps: - name: Checkout uses: actions/checkout@v4 @@ -31,23 +26,12 @@ jobs: - name: Setup Gradle uses: gradle/actions/setup-gradle@v4.2.1 - with: - gradle-home-cache-cleanup: true - - - name: Set up ccache - uses: hendrikmuhs/ccache-action@v1.2 - with: - max-size: 2G - key: ${{ runner.os }} - restore-keys: ${{ runner.os }} - save: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }} - name: Build with Gradle run: | echo 'org.gradle.parallel=true' >> gradle.properties echo 'org.gradle.vfs.watch=true' >> gradle.properties echo 'org.gradle.jvmargs=-Xmx2048m' >> gradle.properties - echo 'android.native.buildOutput=verbose' >> gradle.properties sed -i 's/org.gradle.unsafe.configuration-cache=true//g' gradle.properties ./gradlew zipRelease ./gradlew zipDebug