Merge branch 'tiann:main' into main

tiann · Jan 8, 2024 · 010295d · 010295d
2 parents 660fdb1 + 23ffc2a
commit 010295d
Show file tree

Hide file tree

Showing 8 changed files with 50 additions and 22 deletions.
diff --git a/docs/README_PT-BR.md b/docs/README_PT-BR.md
@@ -34,7 +34,7 @@ Atualmente, apenas `arm64-v8a` e `x86_64` são suportados.
  - [Site oficial](https://kernelsu.org/pt_BR/)
 
 ## Tradução
-Para contribuir com a tradução do KernelSU ou aprimorar traduções existentes, por favor, utilize o [Weblate](https://hosted.weblate.org/engage/kernelsu/). PR para a tradução do Gerenciador não são mais aceitas, pois podem entrar em conflito com o Weblate.
+Para contribuir com a tradução do KernelSU ou aprimorar traduções existentes, por favor, utilize o [Weblate](https://hosted.weblate.org/engage/kernelsu/). PR para a tradução do Gerenciador não são mais aceitos, pois podem entrar em conflito com o Weblate.
 
 ## Discussão
 

diff --git a/website/docs/guide/how-to-integrate-for-non-gki.md b/website/docs/guide/how-to-integrate-for-non-gki.md
@@ -62,10 +62,17 @@ curl -LSs "https://raw.githubusercontent.com/tiann/KernelSU/main/kernel/setup.sh
 
 :::
 
-Then, add KernelSU calls to the kernel source, here is a patch to refer:
+Keep in mind that on some devices, your defconfig may be in `arch/arm64/configs` or in other cases `arch/arm64/configs/vendor/your_defconfig`. For example in your defconfig, Enable `CONFIG_KSU` with y to enable, or n to disable. Your path will be something like:
+`arch/arm64/configs/...` 
+```sh
++# KernelSU
++CONFIG_KSU=y
+```
 
 ::: code-group
 
+Then, add KernelSU calls to the kernel source, here is a patch to refer:
+
 ```diff[exec.c]
 diff --git a/fs/exec.c b/fs/exec.c
 index ac59664eaecf..bdd585e1d2cc 100644
@@ -74,21 +81,25 @@ index ac59664eaecf..bdd585e1d2cc 100644
 @@ -1890,11 +1890,14 @@ static int __do_execve_file(int fd, struct filename *filename,
  	return retval;
  }
- 
+
++#ifdef CONFIG_KSU
 +extern bool ksu_execveat_hook __read_mostly;
 +extern int ksu_handle_execveat(int *fd, struct filename **filename_ptr, void *argv,
 +			void *envp, int *flags);
 +extern int ksu_handle_execveat_sucompat(int *fd, struct filename **filename_ptr,
 +				 void *argv, void *envp, int *flags);
++#endif
  static int do_execveat_common(int fd, struct filename *filename,
  			      struct user_arg_ptr argv,
  			      struct user_arg_ptr envp,
  			      int flags)
  {
++   #ifdef CONFIG_KSU
 +	if (unlikely(ksu_execveat_hook))
 +		ksu_handle_execveat(&fd, &filename, &argv, &envp, &flags);
 +	else
 +		ksu_handle_execveat_sucompat(&fd, &filename, &argv, &envp, &flags);
++   #endif
  	return __do_execve_file(fd, filename, argv, envp, flags, NULL);
  }
 ```
@@ -100,9 +111,11 @@ index 05036d819197..965b84d486b8 100644
 @@ -348,6 +348,8 @@ SYSCALL_DEFINE4(fallocate, int, fd, int, mode, loff_t, offset, loff_t, len)
  	return ksys_fallocate(fd, mode, offset, len);
  }
- 
+
++#ifdef CONFIG_KSU
 +extern int ksu_handle_faccessat(int *dfd, const char __user **filename_user, int *mode,
 +			 int *flags);
++#endif
  /*
   * access() needs to use the real uid/gid, not the effective uid/gid.
   * We do this by temporarily clearing all FS-related capabilities and
@@ -117,8 +130,9 @@ index 05036d819197..965b84d486b8 100644
  	struct vfsmount *mnt;
  	int res;
  	unsigned int lookup_flags = LOOKUP_FOLLOW;
- 
++   #ifdef CONFIG_KSU
 +	ksu_handle_faccessat(&dfd, &filename, &mode, NULL);
++   #endif
  
  	if (mode & ~S_IRWXO)	/* where's F_OK, X_OK, W_OK, R_OK? */
  		return -EINVAL;
@@ -131,16 +145,19 @@ index 650fc7e0f3a6..55be193913b6 100644
 @@ -434,10 +434,14 @@ ssize_t kernel_read(struct file *file, void *buf, size_t count, loff_t *pos)
  }
  EXPORT_SYMBOL(kernel_read);
- 
+
++#ifdef CONFIG_KSU
 +extern bool ksu_vfs_read_hook __read_mostly;
 +extern int ksu_handle_vfs_read(struct file **file_ptr, char __user **buf_ptr,
 +			size_t *count_ptr, loff_t **pos);
++#endif
  ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos)
  {
  	ssize_t ret;
- 
++   #ifdef CONFIG_KSU 
 +	if (unlikely(ksu_vfs_read_hook))
 +		ksu_handle_vfs_read(&file, &buf, &count, &pos);
++   #endif
 +
  	if (!(file->f_mode & FMODE_READ))
  		return -EBADF;
@@ -154,17 +171,21 @@ index 376543199b5a..82adcef03ecc 100644
 @@ -148,6 +148,8 @@ int vfs_statx_fd(unsigned int fd, struct kstat *stat,
  }
  EXPORT_SYMBOL(vfs_statx_fd);
- 
+
++#ifdef CONFIG_KSU
 +extern int ksu_handle_stat(int *dfd, const char __user **filename_user, int *flags);
++#endif
 +
  /**
   * vfs_statx - Get basic and extra attributes by filename
   * @dfd: A file descriptor representing the base dir for a relative filename
 @@ -170,6 +172,7 @@ int vfs_statx(int dfd, const char __user *filename, int flags,
  	int error = -EINVAL;
  	unsigned int lookup_flags = LOOKUP_FOLLOW | LOOKUP_AUTOMOUNT;
- 
+
++   #ifdef CONFIG_KSU
 +	ksu_handle_stat(&dfd, &filename, &flags);
++   #endif
  	if ((flags & ~(AT_SYMLINK_NOFOLLOW | AT_NO_AUTOMOUNT |
  		       AT_EMPTY_PATH | KSTAT_QUERY_FLAGS)) != 0)
  		return -EINVAL;
@@ -198,8 +219,9 @@ index 068fdbcc9e26..5348b7bb9db2 100644
 @@ -94,6 +96,8 @@ int vfs_fstatat(int dfd, const char __user *filename, struct kstat *stat,
  	int error = -EINVAL;
  	unsigned int lookup_flags = 0;
-
++   #ifdef CONFIG_KSU 
 +	ksu_handle_stat(&dfd, &filename, &flag);
++   #endif
 +
  	if ((flag & ~(AT_SYMLINK_NOFOLLOW | AT_NO_AUTOMOUNT |
  		      AT_EMPTY_PATH)) != 0)
@@ -216,18 +238,21 @@ index 2ff887661237..e758d7db7663 100644
 @@ -355,6 +355,9 @@ SYSCALL_DEFINE4(fallocate, int, fd, int, mode, loff_t, offset, loff_t, len)
  	return error;
  }
-
+
++#ifdef CONFIG_KSU
 +extern int ksu_handle_faccessat(int *dfd, const char __user **filename_user, int *mode,
 +			        int *flags);
++#endif
 +
  /*
   * access() needs to use the real uid/gid, not the effective uid/gid.
   * We do this by temporarily clearing all FS-related capabilities and
 @@ -370,6 +373,8 @@ SYSCALL_DEFINE3(faccessat, int, dfd, const char __user *, filename, int, mode)
  	int res;
  	unsigned int lookup_flags = LOOKUP_FOLLOW;
- 
++   #ifdef CONFIG_KSU
 +	ksu_handle_faccessat(&dfd, &filename, &mode, NULL);
++   #endif
 +
  	if (mode & ~S_IRWXO)	/* where's F_OK, X_OK, W_OK, R_OK? */
  		return -EINVAL;
@@ -247,17 +272,20 @@ index 45306f9ef247..815091ebfca4 100755
 @@ -367,10 +367,13 @@ static int input_get_disposition(struct input_dev *dev,
  	return disposition;
  }
-
+
++#ifdef CONFIG_KSU
 +extern bool ksu_input_hook __read_mostly;
 +extern int ksu_handle_input_handle_event(unsigned int *type, unsigned int *code, int *value);
++#endif
 +
  static void input_handle_event(struct input_dev *dev,
  			       unsigned int type, unsigned int code, int value)
  {
 	int disposition = input_get_disposition(dev, type, code, &value);
-+
++   #ifdef CONFIG_KSU
 +	if (unlikely(ksu_input_hook))
 +		ksu_handle_input_handle_event(&type, &code, &value);
++   #endif
 
  	if (disposition != INPUT_IGNORE_EVENT && type != EV_SYN)
  		add_input_randomness(type, code, value);

diff --git a/website/docs/ja_JP/guide/installation.md b/website/docs/ja_JP/guide/installation.md
@@ -153,7 +153,7 @@ fastboot reboot
 ### magiskboot を使う
 
 1. 最新の Magisk を[リリースページ](https://github.com/topjohnwu/Magisk/releases)からダウンロードしてください。
-2. Magisk-*.apk を Magisk-vesion.zip に名前を変更して展開してください。
+2. Magisk-*.apk を Magisk-version.zip に名前を変更して展開してください。
 3. `Magisk-v25.2/lib/arm64-v8a/libmagiskboot.so`を adb でデバイスに転送します：`adb push Magisk-v25.2/lib/arm64-v8a/libmagiskboot.so /data/local/tmp/magiskboot`
 4. 純正 boot.img と AnyKernel3 の中の Image をデバイスに転送します。
 5. adb shell に入り、`cd /data/local/tmp/` し、`chmod +x magiskboot` を実行します。
@@ -166,4 +166,4 @@ fastboot reboot
 実はこれらのインストール方法はすべて、**元のカーネルを KernelSU が提供するカーネルに置き換える**という主旨でしかなく、これが実現できれば他の方法でもインストール可能です：
 
 1. まず Magisk をインストールし、Magisk を通じて root 権限を取得し、カーネル管理アプリで KernelSU の AnyKernel ZIPをインストールする
-2. PC 上で何らかの書き込みツールを使用し、KernelSU が提供するカーネルを書き込む
+2. PC 上で何らかの書き込みツールを使用し、KernelSU が提供するカーネルを書き込む
diff --git a/website/docs/pt_BR/guide/installation.md b/website/docs/pt_BR/guide/installation.md
@@ -144,7 +144,7 @@ Android-Image-Kitchen não é recomendado agora, porque ele não lida corretamen
 ### Usando o magiskboot em dispositivos Android {#using-magiskboot-on-Android-devices}
 
 1. Baixe o Magisk mais recente em [GitHub Releases](https://github.com/topjohnwu/Magisk/releases).
-2. Renomeie o Magisk-*.apk para Magisk-vesion.zip e descompacte-o.
+2. Renomeie o Magisk-*.apk para Magisk-version.zip e descompacte-o.
 3. Envie `Magisk-v25.2/lib/arm64-v8a/libmagiskboot.so` para o seu dispositivo por ADB: `adb push Magisk-v25.2/lib/arm64-v8a/libmagiskboot.so /data/local/tmp/magiskboot`.
 4. Envie o boot.img padrão e Image em AnyKernel3 para o seu dispositivo.
 5. Entre no ADB shell e no diretório cd `/data/local/tmp/`, em seguida, `chmod +x magiskboot`.

diff --git a/website/docs/ru_RU/guide/installation.md b/website/docs/ru_RU/guide/installation.md
@@ -153,7 +153,7 @@ fastboot reboot
 ### Использование magiskboot {#using magiskboot}
 
 1. Загрузите последнюю версию Magisk с [Release Page](https://github.com/topjohnwu/Magisk/releases).
-2. Переименуйте Magisk-*.apk в Magisk-vesion.zip и разархивируйте его.
+2. Переименуйте Magisk-*.apk в Magisk-version.zip и разархивируйте его.
 3. Закачайте `Magisk-v25.2/lib/arm64-v8a/libmagiskboot.so` на устройство с помощью adb: `adb push Magisk-v25.2/lib/arm64-v8a/libmagiskboot.so /data/local/tmp/magiskboot`.
 4. Установите на устройство стоковый boot.img и образ в AnyKernel3.
 5. Войдите в оболочку adb и перейдите в каталог `/data/local/tmp/`, затем `chmod +x magiskboot`.

diff --git a/website/docs/vi_VN/guide/installation.md b/website/docs/vi_VN/guide/installation.md
@@ -155,7 +155,7 @@ Trong số đó, Android-Image-Kitchen phù hợp để hoạt động trên PC
 ### Sử dụng magiskboot
 
 1. Tải xuống Magisk mới nhất từ [Trang phát hành](https://github.com/topjohnwu/Magisk/releases)
-2. Đổi tên Magisk-*.apk thành Magisk-vesion.zip và giải nén nó.
+2. Đổi tên Magisk-*.apk thành Magisk-version.zip và giải nén nó.
 3. Đẩy `Magisk-v25.2/lib/arm64-v8a/libmagiskboot.so` vào thiết bị của bạn bằng adb: `adb push Magisk-v25.2/lib/arm64-v8a/libmagiskboot.so /data/local/tmp /magiskboot`
 4. Đẩy stock boot.img và Image trong AnyKernel3 vào thiết bị của bạn.
 5. Nhập thư mục adb shell và cd `/data/local/tmp/`, sau đó `chmod +x magiskboot`

diff --git a/website/docs/zh_CN/guide/installation.md b/website/docs/zh_CN/guide/installation.md
@@ -145,7 +145,7 @@ Magisk 官方提供的 `magiskboot` 只能运行在 Android/Linux 设备上，
 ### 在 Android 设备上使用 magiskboot {#using-magiskboot-on-Android-devices}
 
 1. 在 Magisk 的 [Release 页面](https://github.com/topjohnwu/Magisk/releases) 下载最新的 Magisk 安装包。
-2. 将 Magisk-*.apk 重命名为 Magisk-vesion.zip 然后解压缩。
+2. 将 Magisk-*.apk 重命名为 Magisk-version.zip 然后解压缩。
 3. 将解压后的 `Magisk-v25.2/lib/arm64-v8a/libmagiskboot.so` 文件，使用 adb push 到手机：`adb push Magisk-v25.2/lib/arm64-v8a/libmagiskboot.so /data/local/tmp/magiskboot`
 4. 使用 adb 将原厂 boot.img 和 AnyKernel3 中的 Image 推送到手机
 5. adb shell 进入 /data/local/tmp/ 目录，然后赋予刚 push 文件的可执行权限 `chmod +x magiskboot`
@@ -185,4 +185,4 @@ PS. 这种方法适用于任何情况下的安装（不限于初次安装或者
 1. 首先安装 Magisk，通过 Magisk 获取 root 权限后使用内核刷写器刷入 KernelSU 的 AnyKernel 包。
 2. 使用某些 PC 上的刷机工具箱刷入 KernelSU 提供的内核。
 
-如果这些方法导致无法开机，请优先尝试用 `magiskboot` 的方法。
+如果这些方法导致无法开机，请优先尝试用 `magiskboot` 的方法。
diff --git a/website/docs/zh_TW/guide/installation.md b/website/docs/zh_TW/guide/installation.md
@@ -153,7 +153,7 @@ fastboot reboot
 ### 使用 magiskboot {#using magiskboot}
 
 1. 在 Magisk 的 [Release 頁面](https://github.com/topjohnwu/Magisk/releases) 下載最新的 Magisk 安裝套件。
-2. 將 Magisk-*.apk 重新命名為 Magisk-vesion.zip 然後解壓縮。
+2. 將 Magisk-*.apk 重新命名為 Magisk-version.zip 然後解壓縮。
 3. 將解壓縮後的 `Magisk-v25.2/lib/arm64-v8a/libmagiskboot.so` 檔案，使用 Adb 推入至手機：`adb push Magisk-v25.2/lib/arm64-v8a/libmagiskboot.so /data/local/tmp/magiskboot`
 4. 使用 Adb 將原廠 boot.img 和 AnyKernel3 中的 Image 推入至手機。
 5. adb shell 進入 /data/local/tmp/ 目錄，然後賦予先前推入檔案的可執行權限 `chmod +x magiskboot`