kernel: remove unused wrapper for

Author: tiann

kernel/kernel_compat.c

@@ -8,12 +8,6 @@
 #include "klog.h" // IWYU pragma: keep
 #include "kernel_compat.h"
 
-long ksu_strncpy_from_user_nofault(char *dst, const void __user *unsafe_addr,
-                   long count)
-{
-    return strncpy_from_user_nofault(dst, unsafe_addr, count);
-}
-
 struct action_cache {
     DECLARE_BITMAP(allow_native, SECCOMP_ARCH_NATIVE_NR);
 #ifdef SECCOMP_ARCH_COMPAT

kernel/kernel_compat.h

@@ -4,10 +4,6 @@
 #include <linux/fs.h>
 #include <linux/version.h>
 
-extern long ksu_strncpy_from_user_nofault(char *dst,
-                      const void __user *unsafe_addr,
-                      long count);
-
 extern void ksu_seccomp_clear_cache(struct seccomp_filter *filter, int nr);
 extern void ksu_seccomp_allow_cache(struct seccomp_filter *filter, int nr);
 

kernel/ksud.c

@@ -199,7 +199,7 @@ int ksu_handle_execveat_ksud(int *fd, struct filename **filename_ptr,
             const char __user *p = get_user_arg_ptr(*argv, 1);
             if (p && !IS_ERR(p)) {
                 char first_arg[16];
-                ksu_strncpy_from_user_nofault(first_arg, p, sizeof(first_arg));
+                strncpy_from_user_nofault(first_arg, p, sizeof(first_arg));
                 pr_info("/system/bin/init first arg: %s\n", first_arg);
                 if (!strcmp(first_arg, "second_stage")) {
                     pr_info("/system/bin/init second_stage executed\n");
@@ -221,7 +221,7 @@ int ksu_handle_execveat_ksud(int *fd, struct filename **filename_ptr,
             const char __user *p = get_user_arg_ptr(*argv, 1);
             if (p && !IS_ERR(p)) {
                 char first_arg[16];
-                ksu_strncpy_from_user_nofault(first_arg, p, sizeof(first_arg));
+                strncpy_from_user_nofault(first_arg, p, sizeof(first_arg));
                 pr_info("/init first arg: %s\n", first_arg);
                 if (!strcmp(first_arg, "--second-stage")) {
                     pr_info("/init second_stage executed\n");
@@ -243,7 +243,7 @@ int ksu_handle_execveat_ksud(int *fd, struct filename **filename_ptr,
                     }
                     char env[256];
                     // Reading environment variable strings from user space
-                    if (ksu_strncpy_from_user_nofault(env, p, sizeof(env)) < 0)
+                    if (strncpy_from_user_nofault(env, p, sizeof(env)) < 0)
                         continue;
                     // Parsing environment variable names and values
                     char *env_name = env;
@@ -488,7 +488,7 @@ static int sys_execve_handler_pre(struct kprobe *p, struct pt_regs *regs)
         return 0;
 
     memset(path, 0, sizeof(path));
-    ksu_strncpy_from_user_nofault(path, *filename_user, 32);
+    strncpy_from_user_nofault(path, *filename_user, 32);
     filename_in.name = path;
 
     filename_p = &filename_in;

kernel/sucompat.c

@@ -149,7 +149,7 @@ static int ksu_handle_faccessat(int *dfd, const char __user **filename_user,
 
     char path[sizeof(su) + 1];
     memset(path, 0, sizeof(path));
-    ksu_strncpy_from_user_nofault(path, *filename_user, sizeof(path));
+    strncpy_from_user_nofault(path, *filename_user, sizeof(path));
 
     if (unlikely(!memcmp(path, su, sizeof(su)))) {
         pr_info("faccessat su->sh!\n");
@@ -189,7 +189,7 @@ static int ksu_handle_stat(int *dfd, const char __user **filename_user,
     pr_info("vfs_statx su->sh!\n");
     memcpy((void *)filename->name, sh, sizeof(sh));
 #else
-    ksu_strncpy_from_user_nofault(path, *filename_user, sizeof(path));
+    strncpy_from_user_nofault(path, *filename_user, sizeof(path));
 
     if (unlikely(!memcmp(path, su, sizeof(su)))) {
         pr_info("newfstatat su->sh!\n");
@@ -211,7 +211,7 @@ int ksu_handle_execve_sucompat(int *fd, const char __user **filename_user,
         return 0;
 
     memset(path, 0, sizeof(path));
-    ksu_strncpy_from_user_nofault(path, *filename_user, sizeof(path));
+    strncpy_from_user_nofault(path, *filename_user, sizeof(path));
 
     if (likely(memcmp(path, su, sizeof(su))))
         return 0;