kernel: ksud: dont create structs just to deconstruct them for a string

__ksu_handle_execve_ksud was building a fake struct filename just
to pass it to ksu_handle_execveat_ksud, which immediately does...
filename->name. ??

All we ever needed was filename->name, but we kept doing this meme where
we manually built a struct filename, passed it around, then immediately
ripped out the string again. ??

refactor this so that __ksu_handle_execveat_ksud, takes plain char *.
The old ksu_handle_execveat_ksud is now a shim that unpacks the struct and
hands off the string like we should’ve been doing from the start.

Also mark ksu_handle_execveat_ksud as maybe unused as this will actually be
unused on syscall-only builds.

This also makes integration easier on kernels that don’t have struct filename.

Rejected: tiann#2595

Signed-off-by: backslashxx <[email protected]>

Author: backslashxx

kernel/ksud.c

@@ -155,16 +155,10 @@ static int __maybe_unused count(struct user_arg_ptr argv, int max)
 }
 
 // IMPORTANT NOTE: the call from execve_handler_pre WON'T provided correct value for envp and flags in GKI version
-int ksu_handle_execveat_ksud(int *fd, struct filename **filename_ptr,
+static int __ksu_handle_execveat_ksud(int *fd, char *filename,
 			     struct user_arg_ptr *argv,
 			     struct user_arg_ptr *envp, int *flags)
 {
-	if (!ksu_execveat_hook) {
-		return 0;
-	}
-
-	struct filename *filename;
-
 	static const char app_process[] = "/system/bin/app_process";
 	static bool first_app_process = true;
 
@@ -174,15 +168,10 @@ int ksu_handle_execveat_ksud(int *fd, struct filename **filename_ptr,
 	static const char old_system_init[] = "/init";
 	static bool init_second_stage_executed = false;
 
-	if (!filename_ptr)
+	if (!filename)
 		return 0;
 
-	filename = *filename_ptr;
-	if (IS_ERR(filename)) {
-		return 0;
-	}
-
-	if (unlikely(!memcmp(filename->name, system_bin_init,
+	if (unlikely(!memcmp(filename, system_bin_init,
 			     sizeof(system_bin_init) - 1) &&
 		     argv)) {
 		// /system/bin/init executed
@@ -206,7 +195,7 @@ int ksu_handle_execveat_ksud(int *fd, struct filename **filename_ptr,
 				pr_err("/system/bin/init parse args err!\n");
 			}
 		}
-	} else if (unlikely(!memcmp(filename->name, old_system_init,
+	} else if (unlikely(!memcmp(filename, old_system_init,
 				    sizeof(old_system_init) - 1) &&
 			    argv)) {
 		// /init executed
@@ -269,7 +258,7 @@ int ksu_handle_execveat_ksud(int *fd, struct filename **filename_ptr,
 		}
 	}
 
-	if (unlikely(first_app_process && !memcmp(filename->name, app_process,
+	if (unlikely(first_app_process && !memcmp(filename, app_process,
 						  sizeof(app_process) - 1))) {
 		first_app_process = false;
 		pr_info("exec app_process, /data prepared, second_stage: %d\n",
@@ -281,6 +270,26 @@ int ksu_handle_execveat_ksud(int *fd, struct filename **filename_ptr,
 	return 0;
 }
 
+// keep this for manually hooked builds
+__maybe_unused int ksu_handle_execveat_ksud(int *fd, struct filename **filename_ptr,
+			     struct user_arg_ptr *argv, struct user_arg_ptr *envp,
+			     int *flags)
+{
+	// return early when disabled
+	if (!ksu_execveat_hook) {
+		return 0;
+	}
+
+	if (!filename_ptr)
+		return 0;
+
+	struct filename *filename = *filename_ptr;
+	if (IS_ERR(filename))
+		return 0;
+
+	return __ksu_handle_execveat_ksud(fd, (char *)filename->name, argv, envp, flags);
+}
+
 static ssize_t (*orig_read)(struct file *, char __user *, size_t, loff_t *);
 static ssize_t (*orig_read_iter)(struct kiocb *, struct iov_iter *);
 static struct file_operations fops_proxy;
@@ -476,7 +485,6 @@ bool ksu_is_safe_mode()
 __maybe_unused static int __ksu_handle_execve_ksud(const char __user *filename_user,
 			struct user_arg_ptr *argv)
 {
-	struct filename filename_in, *filename_p;
 	char path[32];
 
 	// return early if disabled.
@@ -490,11 +498,7 @@ __maybe_unused static int __ksu_handle_execve_ksud(const char __user *filename_u
 	memset(path, 0, sizeof(path));
 	ksu_strncpy_from_user_nofault(path, filename_user, 32);
 
-	// this is because ksu_handle_execveat_ksud calls it filename->name
-	filename_in.name = path;
-	filename_p = &filename_in;
-
-	return ksu_handle_execveat_ksud(AT_FDCWD, &filename_p, argv, NULL, NULL);
+	return __ksu_handle_execveat_ksud(AT_FDCWD, path, argv, NULL, NULL);
 }
 
 // I don't think this is doable with a single entry point