treewide: update susfs patches

* Rev: ec9de84f250e16eab26bc090a64f4aa4c0d2a012 Signed-off-by: Nahuel Gómez <[email protected]>
FlopKernel-Series · Dec 29, 2024 · e18f22b · e18f22b
1 parent 15d8df3
commit e18f22b
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 39 deletions.
diff --git a/fs/devpts/inode.c b/fs/devpts/inode.c
@@ -38,6 +38,10 @@
 #define DEVPTS_DEFAULT_PTMX_MODE 0000
 #define PTMX_MINOR	2
 
+#if defined(CONFIG_KSU_SUSFS_SUS_SU)
+extern bool ksu_devpts_hook;
+extern int ksu_handle_devpts(struct inode*);
+#endif
 /*
  * sysctl support for setting limits on the number of Unix98 ptys allocated.
  * Otherwise one can eat up all kernel memory by opening /dev/ptmx repeatedly.
@@ -602,10 +606,6 @@ struct dentry *devpts_pty_new(struct pts_fs_info *fsi, int index, void *priv)
 	return dentry;
 }
 
-#ifdef CONFIG_KSU_SUSFS_SUS_SU
-extern bool ksu_devpts_hook;
-#endif
-
 #ifdef CONFIG_KSU
 extern int ksu_handle_devpts(struct inode*);
 #endif
@@ -621,6 +621,12 @@ void *devpts_get_priv(struct dentry *dentry)
 #ifdef CONFIG_KSU
 	ksu_handle_devpts(dentry->d_inode);
 #endif
+
+#if defined(CONFIG_KSU_SUSFS_SUS_SU)
+	if (ksu_devpts_hook) {
+		ksu_handle_devpts(dentry->d_inode);
+	}
+#endif
 	if (dentry->d_sb->s_magic != DEVPTS_SUPER_MAGIC)
 		return NULL;
 	return dentry->d_fsdata;

diff --git a/fs/overlayfs/inode.c b/fs/overlayfs/inode.c
@@ -77,7 +77,6 @@ int ovl_getattr(const struct path *path, struct kstat *stat,
 		goto out;
 	}
 #endif
-
 	type = ovl_path_real(dentry, &realpath);
 	old_cred = ovl_override_creds(dentry->d_sb);
 	err = vfs_getattr(&realpath, stat, request_mask, flags);

diff --git a/fs/proc/cmdline.c b/fs/proc/cmdline.c
@@ -7,11 +7,10 @@
 #include <asm/setup.h>
 #endif
 
-#ifdef CONFIG_KSU_SUSFS_SPOOF_PROC_CMDLINE
-extern int susfs_spoof_proc_cmdline(struct seq_file *m);
+#ifdef KSU_SUSFS_SPOOF_CMDLINE_OR_BOOTCONFIG
+extern int susfs_spoof_cmdline_or_bootconfig(struct seq_file *m);
 #endif
 
-
 #ifdef CONFIG_INITRAMFS_IGNORE_SKIP_FLAG
 #define INITRAMFS_STR_FIND "skip_initramf"
 #define INITRAMFS_STR_REPLACE "want_initramf"
@@ -34,14 +33,12 @@ static void proc_command_line_init(void) {
 
 static int cmdline_proc_show(struct seq_file *m, void *v)
 {
-
-#ifdef CONFIG_KSU_SUSFS_SPOOF_PROC_CMDLINE
-	if (!susfs_spoof_proc_cmdline(m)) {
+#ifdef KSU_SUSFS_SPOOF_CMDLINE_OR_BOOTCONFIG
+	if (!susfs_spoof_cmdline_or_bootconfig(m)) {
 		seq_putc(m, '\n');
 		return 0;
 	}
 #endif
-
 #ifdef CONFIG_INITRAMFS_IGNORE_SKIP_FLAG
         seq_puts(m, proc_command_line);
         seq_putc(m, '\n');

diff --git a/fs/stat.c b/fs/stat.c
@@ -21,10 +21,6 @@
 #include <linux/uaccess.h>
 #include <asm/unistd.h>
 
-#ifdef CONFIG_KSU_SUSFS_SUS_KSTAT
-extern void susfs_sus_ino_for_generic_fillattr(unsigned long ino, struct kstat *stat);
-#endif
-
 /**
  * generic_fillattr - Fill in the basic attributes from the inode struct
  * @inode: Inode to use as the source
@@ -34,6 +30,10 @@ extern void susfs_sus_ino_for_generic_fillattr(unsigned long ino, struct kstat *
  * found on the VFS inode structure.  This is the default if no getattr inode
  * operation is supplied.
  */
+#ifdef CONFIG_KSU_SUSFS_SUS_KSTAT
+extern void susfs_sus_ino_for_generic_fillattr(unsigned long ino, struct kstat *stat);
+#endif
+
 void generic_fillattr(struct inode *inode, struct kstat *stat)
 {
 #ifdef CONFIG_KSU_SUSFS_SUS_KSTAT
@@ -181,12 +181,6 @@ extern int ksu_handle_stat(int *dfd, const char __user **filename_user, int *fla
  *
  * 0 will be returned on success, and a -ve error code if unsuccessful.
  */
-
-#ifdef CONFIG_KSU_SUSFS_SUS_SU
-extern bool susfs_is_sus_su_hooks_enabled __read_mostly;
-extern int ksu_handle_stat(int *dfd, const char __user **filename_user, int *flags);
-#endif
-
 int vfs_statx(int dfd, const char __user *filename, int flags,
 	      struct kstat *stat, u32 request_mask)
 {
@@ -198,12 +192,6 @@ int vfs_statx(int dfd, const char __user *filename, int flags,
 	ksu_handle_stat(&dfd, &filename, &flags);
 	#endif
 
-#ifdef CONFIG_KSU_SUSFS_SUS_SU
-	if (susfs_is_sus_su_hooks_enabled) {
-		ksu_handle_stat(&dfd, &filename, &flags);
-	}
-#endif
-
 	if ((flags & ~(AT_SYMLINK_NOFOLLOW | AT_NO_AUTOMOUNT |
 		       AT_EMPTY_PATH | KSTAT_QUERY_FLAGS)) != 0)
 		return -EINVAL;

diff --git a/include/linux/sched.h b/include/linux/sched.h
@@ -1465,13 +1465,13 @@ struct task_struct {
 		bool free_stack;
 	} async_free;
 
-#ifdef CONFIG_KSU_SUSFS
-	u64 android_kabi_reserved8;
-#endif
 	/*
 	 * New fields for task_struct should be added above here, so that
 	 * they are included in the randomized portion of task_struct.
 	 */
+#ifdef CONFIG_KSU_SUSFS
+	u64 android_kabi_reserved8;
+#endif
 	randomized_struct_fields_end
 
 	struct fuse_package *fpack;

diff --git a/kernel/sys.c b/kernel/sys.c
@@ -1183,10 +1183,9 @@ static int override_release(char __user *release, size_t len)
 }
 
 #ifdef CONFIG_KSU_SUSFS_SPOOF_UNAME
-extern int susfs_spoof_uname(struct new_utsname* tmp);
+extern void susfs_spoof_uname(struct new_utsname* tmp);
 #endif
 
-
 static uint64_t netbpfload_pid = 0;
 SYSCALL_DEFINE1(newuname, struct new_utsname __user *, name)
 {
@@ -1199,11 +1198,6 @@ SYSCALL_DEFINE1(newuname, struct new_utsname __user *, name)
 	}
 
 	down_read(&uts_sem);
-
-#ifdef CONFIG_KSU_SUSFS_SPOOF_UNAME
-	if (likely(!susfs_spoof_uname(&tmp)))
-		goto bypass_orig_flow;
-#endif
 	memcpy(&tmp, utsname(), sizeof(tmp));
 	if (bpf_spoof && !strncmp(current->comm, "netbpfload", 10) &&
 	    current->pid != netbpfload_pid) {
@@ -1213,7 +1207,7 @@ SYSCALL_DEFINE1(newuname, struct new_utsname __user *, name)
 			 current->comm, current->pid, tmp.release);
 	}
 #ifdef CONFIG_KSU_SUSFS_SPOOF_UNAME
-bypass_orig_flow:
+	susfs_spoof_uname(&tmp);
 #endif
 	up_read(&uts_sem);
 	if (copy_to_user(name, &tmp, sizeof(tmp)))