Commit e3efbfbf authored by Christophe Leroy's avatar Christophe Leroy Committed by Madhavan Srinivasan
Browse files

powerpc/uaccess: Remove unused size and from parameters from allow_access_user() 



Since commit 16132529 ("powerpc/32s: Rework Kernel Userspace
Access Protection") the size parameter is unused on all platforms.

And the 'from' parameter has never been used.

Remove them.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarMadhavan Srinivasan <maddy@linux.ibm.com>
Link: https://patch.msgid.link/4552b00707923b71150ee47b925d6eaae1b03261.1766574657.git.chleroy@kernel.org
parent 5fbc09eb

arch/powerpc/include/asm/book3s/32/kup.h

+1 −2
Original line number Diff line number Diff line
@@ -97,8 +97,7 @@ static __always_inline unsigned long __kuap_get_and_assert_locked(void) 
}

#define __kuap_get_and_assert_locked __kuap_get_and_assert_locked



static __always_inline void allow_user_access(void __user *to, const void __user *from,

					      u32 size, unsigned long dir)

static __always_inline void allow_user_access(void __user *to, unsigned long dir)

{

	BUILD_BUG_ON(!__builtin_constant_p(dir));

arch/powerpc/include/asm/book3s/64/kup.h

+2 −4
Original line number Diff line number Diff line
@@ -353,8 +353,7 @@ __bad_kuap_fault(struct pt_regs *regs, unsigned long address, bool is_write) 
	return (regs->amr & AMR_KUAP_BLOCK_READ) == AMR_KUAP_BLOCK_READ;

}



static __always_inline void allow_user_access(void __user *to, const void __user *from,

					      unsigned long size, unsigned long dir)

static __always_inline void allow_user_access(void __user *to, unsigned long dir)

{

	unsigned long thread_amr = 0;
@@ -383,8 +382,7 @@ static __always_inline unsigned long get_kuap(void) 


static __always_inline void set_kuap(unsigned long value) { }



static __always_inline void allow_user_access(void __user *to, const void __user *from,

					      unsigned long size, unsigned long dir)

static __always_inline void allow_user_access(void __user *to, unsigned long dir)

{ }



#endif /* !CONFIG_PPC_KUAP */

arch/powerpc/include/asm/kup.h

+4 −5
Original line number Diff line number Diff line
@@ -72,8 +72,7 @@ static __always_inline void __kuap_kernel_restore(struct pt_regs *regs, unsigned 
 * platforms.

 */

#ifndef CONFIG_PPC_BOOK3S_64

static __always_inline void allow_user_access(void __user *to, const void __user *from,

					      unsigned long size, unsigned long dir) { }

static __always_inline void allow_user_access(void __user *to, unsigned long dir) { }

static __always_inline void prevent_user_access(unsigned long dir) { }

static __always_inline unsigned long prevent_user_access_return(void) { return 0UL; }

static __always_inline void restore_user_access(unsigned long flags) { }
@@ -134,18 +133,18 @@ static __always_inline void kuap_assert_locked(void) 


static __always_inline void allow_read_from_user(const void __user *from, unsigned long size)

{

	allow_user_access(NULL, from, size, KUAP_READ);

	allow_user_access(NULL, KUAP_READ);

}



static __always_inline void allow_write_to_user(void __user *to, unsigned long size)

{

	allow_user_access(to, NULL, size, KUAP_WRITE);

	allow_user_access(to, KUAP_WRITE);

}



static __always_inline void allow_read_write_user(void __user *to, const void __user *from,

						  unsigned long size)

{

	allow_user_access(to, from, size, KUAP_READ_WRITE);

	allow_user_access(to, KUAP_READ_WRITE);

}



static __always_inline void prevent_read_from_user(const void __user *from, unsigned long size)

arch/powerpc/include/asm/nohash/32/kup-8xx.h

+1 −2
Original line number Diff line number Diff line
@@ -49,8 +49,7 @@ static __always_inline void uaccess_end_8xx(void) 
	    "i"(SPRN_MD_AP), "r"(MD_APG_KUAP), "i"(MMU_FTR_KUAP) : "memory");

}



static __always_inline void allow_user_access(void __user *to, const void __user *from,

					      unsigned long size, unsigned long dir)

static __always_inline void allow_user_access(void __user *to, unsigned long dir)

{

	uaccess_begin_8xx(MD_APG_INIT);

}

arch/powerpc/include/asm/nohash/kup-booke.h

+1 −2
Original line number Diff line number Diff line
@@ -73,8 +73,7 @@ static __always_inline void uaccess_end_booke(void) 
	    "i"(SPRN_PID), "r"(0), "i"(MMU_FTR_KUAP) : "memory");

}



static __always_inline void allow_user_access(void __user *to, const void __user *from,

					      unsigned long size, unsigned long dir)

static __always_inline void allow_user_access(void __user *to, unsigned long dir)

{

	uaccess_begin_booke(current->thread.pid);

}