You've already forked KernelSU-Next
mirror of
https://github.com/KernelSU-Next/KernelSU-Next.git
synced 2025-08-27 23:46:34 +00:00
kernel/Makefile: remove redundant get_cred_rcu backports
This commit is contained in:
@@ -68,42 +68,8 @@ $(info -- KernelSU-Next Manager signature hash: $(KSU_NEXT_EXPECTED_HASH))
|
|||||||
ccflags-y += -DEXPECTED_NEXT_SIZE=$(KSU_NEXT_EXPECTED_SIZE)
|
ccflags-y += -DEXPECTED_NEXT_SIZE=$(KSU_NEXT_EXPECTED_SIZE)
|
||||||
ccflags-y += -DEXPECTED_NEXT_HASH=\"$(KSU_NEXT_EXPECTED_HASH)\"
|
ccflags-y += -DEXPECTED_NEXT_HASH=\"$(KSU_NEXT_EXPECTED_HASH)\"
|
||||||
|
|
||||||
ccflags-y += -DKSU_COMPAT_GET_CRED_RCU
|
|
||||||
|
|
||||||
ccflags-y += -DKSU_UMOUNT
|
ccflags-y += -DKSU_UMOUNT
|
||||||
|
|
||||||
# Determine the appropriate atomic function and apply patch accordingly
|
|
||||||
ifeq ($(shell grep -q "atomic_inc_not_zero" $(srctree)/kernel/cred.c; echo $$?),0)
|
|
||||||
ATOMIC_INC_FUNC = atomic_inc_not_zero
|
|
||||||
else ifeq ($(shell grep -q "atomic_long_inc_not_zero" $(srctree)/kernel/cred.c; echo $$?),0)
|
|
||||||
ATOMIC_INC_FUNC = atomic_long_inc_not_zero
|
|
||||||
else
|
|
||||||
$(info -- KSU_NEXT: Neither atomic_inc_not_zero nor atomic_long_inc_not_zero found in kernel/cred.c)
|
|
||||||
endif
|
|
||||||
|
|
||||||
# Inform which function is being patched
|
|
||||||
$(info -- KSU_NEXT: Using $(ATOMIC_INC_FUNC) in get_cred_rcu patch.)
|
|
||||||
|
|
||||||
# Add the get_cred_rcu function to cred.h if not already present
|
|
||||||
ifneq ($(shell grep -Eq "^static inline const struct cred \*get_cred_rcu" $(srctree)/include/linux/cred.h; echo $$?),0)
|
|
||||||
$(info -- KSU_NEXT: adding function 'static inline const struct cred *get_cred_rcu(const struct cred *cred);' to $(srctree)/include/linux/cred.h)
|
|
||||||
GET_CRED_RCU = static inline const struct cred *get_cred_rcu(const struct cred *cred)\n\
|
|
||||||
{\n\t\
|
|
||||||
struct cred *nonconst_cred = (struct cred *) cred;\n\t\
|
|
||||||
if (!cred)\n\t\t\
|
|
||||||
return NULL;\n\t\
|
|
||||||
if (!$(ATOMIC_INC_FUNC)(&nonconst_cred->usage))\n\t\t\
|
|
||||||
return NULL;\n\t\
|
|
||||||
validate_creds(cred);\n\t\
|
|
||||||
return cred;\n\
|
|
||||||
}\n
|
|
||||||
$(shell grep -qF "$(GET_CRED_RCU)" $(srctree)/include/linux/cred.h || sed -i '/^static inline void put_cred/i $(GET_CRED_RCU)' $(srctree)/include/linux/cred.h)
|
|
||||||
|
|
||||||
# Modify get_task_cred in cred.c
|
|
||||||
$(info -- KSU_NEXT: modifying 'get_task_cred' function in $(srctree)/kernel/cred.c)
|
|
||||||
$(shell sed -i "s/!$(ATOMIC_INC_FUNC)(&((struct cred \*)cred)->usage)/!get_cred_rcu(cred)/g" $(srctree)/kernel/cred.c)
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifneq ($(shell grep -Eq "^static int can_umount" $(srctree)/fs/namespace.c; echo $$?),0)
|
ifneq ($(shell grep -Eq "^static int can_umount" $(srctree)/fs/namespace.c; echo $$?),0)
|
||||||
$(info -- KSU_NEXT: adding function 'static int can_umount(const struct path *path, int flags);' to $(srctree)/fs/namespace.c)
|
$(info -- KSU_NEXT: adding function 'static int can_umount(const struct path *path, int flags);' to $(srctree)/fs/namespace.c)
|
||||||
CAN_UMOUNT = static int can_umount(const struct path *path, int flags)\n\
|
CAN_UMOUNT = static int can_umount(const struct path *path, int flags)\n\
|
||||||
|
|||||||
@@ -47,10 +47,6 @@
|
|||||||
#include "throne_tracker.h"
|
#include "throne_tracker.h"
|
||||||
#include "kernel_compat.h"
|
#include "kernel_compat.h"
|
||||||
|
|
||||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 0, 0) || defined(KSU_COMPAT_GET_CRED_RCU)
|
|
||||||
#define KSU_GET_CRED_RCU
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static bool ksu_module_mounted = false;
|
static bool ksu_module_mounted = false;
|
||||||
|
|
||||||
extern int handle_sepolicy(unsigned long arg3, void __user *arg4);
|
extern int handle_sepolicy(unsigned long arg3, void __user *arg4);
|
||||||
|
|||||||
Reference in New Issue
Block a user