android/SukiSU-Ultra
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

kernel: fix compile err and format code. close #706

Browse Source
This commit is contained in:
weishu
2023-07-02 14:51:14 +08:00
parent c0066b68f5
commit dfc2a86e70
1 changed files with 87 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
kernel/kernel_compat.c
View File

@@ -1,7 +1,8 @@
#include "linux/version.h" #include "linux/version.h"
#include "linux/fs.h" #include "linux/fs.h"
#include "linux/nsproxy.h" #include "linux/nsproxy.h"
#include "klog.h" #include "klog.h" // IWYU pragma: keep
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)
#include "linux/key.h" #include "linux/key.h"
#include "linux/errno.h" #include "linux/errno.h"
@@ -26,18 +27,22 @@ static inline int install_session_keyring(struct key *keyring)
} }
#endif #endif
extern struct task_struct init_task;
// mnt_ns context switch for environment that android_init->nsproxy->mnt_ns != init_task.nsproxy->mnt_ns, such as WSA // mnt_ns context switch for environment that android_init->nsproxy->mnt_ns != init_task.nsproxy->mnt_ns, such as WSA
struct ksu_ns_fs_saved { struct ksu_ns_fs_saved {
struct nsproxy *ns; struct nsproxy *ns;
struct fs_struct *fs; struct fs_struct *fs;
}; };
static void ksu_save_ns_fs(struct ksu_ns_fs_saved *ns_fs_saved) { static void ksu_save_ns_fs(struct ksu_ns_fs_saved *ns_fs_saved)
{
ns_fs_saved->ns = current->nsproxy; ns_fs_saved->ns = current->nsproxy;
ns_fs_saved->fs = current->fs; ns_fs_saved->fs = current->fs;
} }
static void ksu_load_ns_fs(struct ksu_ns_fs_saved *ns_fs_saved) { static void ksu_load_ns_fs(struct ksu_ns_fs_saved *ns_fs_saved)
{
current->nsproxy = ns_fs_saved->ns; current->nsproxy = ns_fs_saved->ns;
current->fs = ns_fs_saved->fs; current->fs = ns_fs_saved->fs;
} }
@@ -46,13 +51,17 @@ static bool android_context_saved_checked = false;
static bool android_context_saved_enabled = false; static bool android_context_saved_enabled = false;
static struct ksu_ns_fs_saved android_context_saved; static struct ksu_ns_fs_saved android_context_saved;
void ksu_android_ns_fs_check() { void ksu_android_ns_fs_check()
if (android_context_saved_checked) return; {
if (android_context_saved_checked)
return;
android_context_saved_checked = true; android_context_saved_checked = true;
task_lock(current); task_lock(current);
if (current->nsproxy && current->fs && current->nsproxy->mnt_ns != init_task.nsproxy->mnt_ns) { if (current->nsproxy && current->fs &&
current->nsproxy->mnt_ns != init_task.nsproxy->mnt_ns) {
android_context_saved_enabled = true; android_context_saved_enabled = true;
pr_info("android contex saved enabled due to init mnt_ns(%p) != android mnt_ns(%p)\n", current->nsproxy->mnt_ns, init_task.nsproxy->mnt_ns); pr_info("android contex saved enabled due to init mnt_ns(%p) != android mnt_ns(%p)\n",
current->nsproxy->mnt_ns, init_task.nsproxy->mnt_ns);
ksu_save_ns_fs(&android_context_saved); ksu_save_ns_fs(&android_context_saved);
} else { } else {
pr_info("android contex saved disabled\n"); pr_info("android contex saved disabled\n");
@@ -60,11 +69,12 @@ void ksu_android_ns_fs_check() {
task_unlock(current); task_unlock(current);
} }
struct file *ksu_filp_open_compat(const char *filename, int flags, umode_t mode){ struct file *ksu_filp_open_compat(const char *filename, int flags, umode_t mode)
{
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)
static bool keyring_installed = false; static bool keyring_installed = false;
if (init_session_keyring != NULL && !keyring_installed && (current->flags & PF_WQ_WORKER)) if (init_session_keyring != NULL && !keyring_installed &&
{ (current->flags & PF_WQ_WORKER)) {
pr_info("installing init session keyring for older kernel\n"); pr_info("installing init session keyring for older kernel\n");
install_session_keyring(init_session_keyring); install_session_keyring(init_session_keyring);
keyring_installed = true; keyring_installed = true;
@@ -89,28 +99,30 @@ struct file *ksu_filp_open_compat(const char *filename, int flags, umode_t mode)
return fp; return fp;
} }
ssize_t ksu_kernel_read_compat(struct file *p, void *buf, size_t count, loff_t *pos){ ssize_t ksu_kernel_read_compat(struct file *p, void *buf, size_t count,
loff_t *pos)
{
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0) #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)
return kernel_read(p, buf, count, pos); return kernel_read(p, buf, count, pos);
#else #else
loff_t offset = pos ? *pos : 0; loff_t offset = pos ? *pos : 0;
ssize_t result = kernel_read(p, offset, (char *)buf, count); ssize_t result = kernel_read(p, offset, (char *)buf, count);
if (pos && result > 0) if (pos && result > 0) {
{
*pos = offset + result; *pos = offset + result;
} }
return result; return result;
#endif #endif
} }
ssize_t ksu_kernel_write_compat(struct file *p, const void *buf, size_t count, loff_t *pos){ ssize_t ksu_kernel_write_compat(struct file *p, const void *buf, size_t count,
loff_t *pos)
{
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0) #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)
return kernel_write(p, buf, count, pos); return kernel_write(p, buf, count, pos);
#else #else
loff_t offset = pos ? *pos : 0; loff_t offset = pos ? *pos : 0;
ssize_t result = kernel_write(p, buf, count, offset); ssize_t result = kernel_write(p, buf, count, offset);
if (pos && result > 0) if (pos && result > 0) {
{
*pos = offset + result; *pos = offset + result;
} }
return result; return result;