mirror of
https://github.com/torvalds/linux.git
synced 2026-05-29 17:43:52 +02:00
mm/pkeys: remove unused tsk parameter from arch_set_user_pkey_access()
The tsk parameter in arch_set_user_pkey_access() is never used in the function implementations across all architectures (arm64, powerpc, x86). Link: https://lkml.kernel.org/r/20260219063506.545148-1-sgsu.park@samsung.com Signed-off-by: Seongsu Park <sgsu.park@samsung.com> Cc: "Borislav Petkov (AMD)" <bp@alien8.de> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: Liam Howlett <liam.howlett@oracle.com> Cc: Lorenzo Stoakes <lorenzo.stoakes@oracle.com> Cc: Madhavan Srinivasan <maddy@linux.ibm.com> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Will Deacon <will@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
parent
0e8cf9a31a
commit
3d443691ed
|
|
@ -12,8 +12,7 @@
|
|||
|
||||
#define arch_max_pkey() 8
|
||||
|
||||
int arch_set_user_pkey_access(struct task_struct *tsk, int pkey,
|
||||
unsigned long init_val);
|
||||
int arch_set_user_pkey_access(int pkey, unsigned long init_val);
|
||||
|
||||
static inline bool arch_pkeys_enabled(void)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -2206,7 +2206,7 @@ void __cpu_replace_ttbr1(pgd_t *pgdp, bool cnp)
|
|||
}
|
||||
|
||||
#ifdef CONFIG_ARCH_HAS_PKEYS
|
||||
int arch_set_user_pkey_access(struct task_struct *tsk, int pkey, unsigned long init_val)
|
||||
int arch_set_user_pkey_access(int pkey, unsigned long init_val)
|
||||
{
|
||||
u64 new_por;
|
||||
u64 old_por;
|
||||
|
|
|
|||
|
|
@ -143,10 +143,8 @@ static inline int arch_override_mprotect_pkey(struct vm_area_struct *vma,
|
|||
return __arch_override_mprotect_pkey(vma, prot, pkey);
|
||||
}
|
||||
|
||||
extern int __arch_set_user_pkey_access(struct task_struct *tsk, int pkey,
|
||||
unsigned long init_val);
|
||||
static inline int arch_set_user_pkey_access(struct task_struct *tsk, int pkey,
|
||||
unsigned long init_val)
|
||||
extern int __arch_set_user_pkey_access(int pkey, unsigned long init_val);
|
||||
static inline int arch_set_user_pkey_access(int pkey, unsigned long init_val)
|
||||
{
|
||||
if (!mmu_has_feature(MMU_FTR_PKEY))
|
||||
return -EINVAL;
|
||||
|
|
@ -160,7 +158,7 @@ static inline int arch_set_user_pkey_access(struct task_struct *tsk, int pkey,
|
|||
if (pkey == 0)
|
||||
return init_val ? -EINVAL : 0;
|
||||
|
||||
return __arch_set_user_pkey_access(tsk, pkey, init_val);
|
||||
return __arch_set_user_pkey_access(pkey, init_val);
|
||||
}
|
||||
|
||||
static inline bool arch_pkeys_enabled(void)
|
||||
|
|
|
|||
|
|
@ -335,8 +335,7 @@ static inline void init_iamr(int pkey, u8 init_bits)
|
|||
* Set the access rights in AMR IAMR and UAMOR registers for @pkey to that
|
||||
* specified in @init_val.
|
||||
*/
|
||||
int __arch_set_user_pkey_access(struct task_struct *tsk, int pkey,
|
||||
unsigned long init_val)
|
||||
int __arch_set_user_pkey_access(int pkey, unsigned long init_val)
|
||||
{
|
||||
u64 new_amr_bits = 0x0ul;
|
||||
u64 new_iamr_bits = 0x0ul;
|
||||
|
|
|
|||
|
|
@ -9,8 +9,7 @@
|
|||
*/
|
||||
#define arch_max_pkey() (cpu_feature_enabled(X86_FEATURE_OSPKE) ? 16 : 1)
|
||||
|
||||
extern int arch_set_user_pkey_access(struct task_struct *tsk, int pkey,
|
||||
unsigned long init_val);
|
||||
extern int arch_set_user_pkey_access(int pkey, unsigned long init_val);
|
||||
|
||||
static inline bool arch_pkeys_enabled(void)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1080,8 +1080,7 @@ void __user *get_xsave_addr_user(struct xregs_state __user *xsave, int xfeature_
|
|||
* This will go out and modify PKRU register to set the access
|
||||
* rights for @pkey to @init_val.
|
||||
*/
|
||||
int arch_set_user_pkey_access(struct task_struct *tsk, int pkey,
|
||||
unsigned long init_val)
|
||||
int arch_set_user_pkey_access(int pkey, unsigned long init_val)
|
||||
{
|
||||
u32 old_pkru, new_pkru_bits = 0;
|
||||
int pkey_shift;
|
||||
|
|
|
|||
|
|
@ -42,8 +42,7 @@ int __execute_only_pkey(struct mm_struct *mm)
|
|||
* Set up PKRU so that it denies access for everything
|
||||
* other than execution.
|
||||
*/
|
||||
ret = arch_set_user_pkey_access(current, execute_only_pkey,
|
||||
PKEY_DISABLE_ACCESS);
|
||||
ret = arch_set_user_pkey_access(execute_only_pkey, PKEY_DISABLE_ACCESS);
|
||||
/*
|
||||
* If the PKRU-set operation failed somehow, just return
|
||||
* 0 and effectively disable execute-only support.
|
||||
|
|
|
|||
|
|
@ -978,7 +978,7 @@ SYSCALL_DEFINE2(pkey_alloc, unsigned long, flags, unsigned long, init_val)
|
|||
if (pkey == -1)
|
||||
goto out;
|
||||
|
||||
ret = arch_set_user_pkey_access(current, pkey, init_val);
|
||||
ret = arch_set_user_pkey_access(pkey, init_val);
|
||||
if (ret) {
|
||||
mm_pkey_free(current->mm, pkey);
|
||||
goto out;
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user