powerpc/kuap: Remove to/from/size parameters of prevent_user_access()

prevent_user_access() doesn't use anymore to/from/size parameters.

Remove them.

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/b7113662fd2c26e4c33e9d705de324bd3860822e.1622708530.git.christophe.leroy@csgroup.eu

diff --git a/arch/powerpc/include/asm/book3s/32/kup.h b/arch/powerpc/include/asm/book3s/32/kup.h
index eb5ef59a406bf3cf31d3e7088323093a9899c8bb..64201125a287bd22a5ff3fbbee9b23309f00a52e 100644 (file)
--- a/arch/powerpc/include/asm/book3s/32/kup.h
+++ b/arch/powerpc/include/asm/book3s/32/kup.h
@@ -153,8 +153,7 @@ static __always_inline void allow_user_access(void __user *to, const void __user
        kuap_unlock_one((__force u32)to);
 }
 
-static __always_inline void prevent_user_access(void __user *to, const void __user *from,
-                                               u32 size, unsigned long dir)
+static __always_inline void prevent_user_access(unsigned long dir)
 {
        u32 kuap = current->thread.kuap;
 

diff --git a/arch/powerpc/include/asm/book3s/64/kup.h b/arch/powerpc/include/asm/book3s/64/kup.h
index 9700da3a40933b083ab9302cad8d03cbf94ee10e..a1cc73a88710e2dc5e1618eb2d4a67aef8e9b189 100644 (file)
--- a/arch/powerpc/include/asm/book3s/64/kup.h
+++ b/arch/powerpc/include/asm/book3s/64/kup.h
@@ -398,8 +398,7 @@ static __always_inline void allow_user_access(void __user *to, const void __user
 
 #endif /* !CONFIG_PPC_KUAP */
 
-static inline void prevent_user_access(void __user *to, const void __user *from,
-                                      unsigned long size, unsigned long dir)
+static inline void prevent_user_access(unsigned long dir)
 {
        set_kuap(AMR_KUAP_BLOCKED);
        if (static_branch_unlikely(&uaccess_flush_key))

diff --git a/arch/powerpc/include/asm/kup.h b/arch/powerpc/include/asm/kup.h
index 2c47feee9482b5b394147c008a5fc699a3533081..0202a7e84a49ca7042cfdc228a11cd2f0322daf9 100644 (file)
--- a/arch/powerpc/include/asm/kup.h
+++ b/arch/powerpc/include/asm/kup.h
@@ -72,8 +72,7 @@ static inline unsigned long kuap_get_and_assert_locked(void)
 #ifndef CONFIG_PPC_BOOK3S_64
 static inline void allow_user_access(void __user *to, const void __user *from,
                                     unsigned long size, unsigned long dir) { }
-static inline void prevent_user_access(void __user *to, const void __user *from,
-                                      unsigned long size, unsigned long dir) { }
+static inline void prevent_user_access(unsigned long dir) { }
 static inline unsigned long prevent_user_access_return(void) { return 0UL; }
 static inline void restore_user_access(unsigned long flags) { }
 #endif /* CONFIG_PPC_BOOK3S_64 */
@@ -105,33 +104,33 @@ static inline void allow_read_write_user(void __user *to, const void __user *fro
 
 static inline void prevent_read_from_user(const void __user *from, unsigned long size)
 {
-       prevent_user_access(NULL, from, size, KUAP_READ);
+       prevent_user_access(KUAP_READ);
 }
 
 static inline void prevent_write_to_user(void __user *to, unsigned long size)
 {
-       prevent_user_access(to, NULL, size, KUAP_WRITE);
+       prevent_user_access(KUAP_WRITE);
 }
 
 static inline void prevent_read_write_user(void __user *to, const void __user *from,
                                           unsigned long size)
 {
-       prevent_user_access(to, from, size, KUAP_READ_WRITE);
+       prevent_user_access(KUAP_READ_WRITE);
 }
 
 static inline void prevent_current_access_user(void)
 {
-       prevent_user_access(NULL, NULL, ~0UL, KUAP_READ_WRITE);
+       prevent_user_access(KUAP_READ_WRITE);
 }
 
 static inline void prevent_current_read_from_user(void)
 {
-       prevent_user_access(NULL, NULL, ~0UL, KUAP_READ);
+       prevent_user_access(KUAP_READ);
 }
 
 static inline void prevent_current_write_to_user(void)
 {
-       prevent_user_access(NULL, NULL, ~0UL, KUAP_WRITE);
+       prevent_user_access(KUAP_WRITE);
 }
 
 #endif /* !__ASSEMBLY__ */

diff --git a/arch/powerpc/include/asm/nohash/32/kup-8xx.h b/arch/powerpc/include/asm/nohash/32/kup-8xx.h
index f6a3c1935e75e8e9fea2ad678db1f8a364e1f677..882a0bc7887a57c52a09d5ec89969a391a0bdb50 100644 (file)
--- a/arch/powerpc/include/asm/nohash/32/kup-8xx.h
+++ b/arch/powerpc/include/asm/nohash/32/kup-8xx.h
@@ -71,8 +71,7 @@ static inline void allow_user_access(void __user *to, const void __user *from,
        mtspr(SPRN_MD_AP, MD_APG_INIT);
 }
 
-static inline void prevent_user_access(void __user *to, const void __user *from,
-                                      unsigned long size, unsigned long dir)
+static inline void prevent_user_access(unsigned long dir)
 {
        if (kuap_is_disabled())
                return;