Commit d008f8f8 authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman

powerpc/kuap: Remove KUAP_CURRENT_XXX

book3s/32 was the only user of KUAP_CURRENT_XXX.

After rework of book3s/32 KUAP, it is not used anymore.

Remove them.
Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/549214ecf6887d965645e664520d4886663c5ffb.1622708530.git.christophe.leroy@csgroup.eu
parent 9f5bd8f1
...@@ -145,7 +145,6 @@ static __always_inline void allow_user_access(void __user *to, const void __user ...@@ -145,7 +145,6 @@ static __always_inline void allow_user_access(void __user *to, const void __user
return; return;
BUILD_BUG_ON(!__builtin_constant_p(dir)); BUILD_BUG_ON(!__builtin_constant_p(dir));
BUILD_BUG_ON(dir & ~KUAP_READ_WRITE);
if (!(dir & KUAP_WRITE)) if (!(dir & KUAP_WRITE))
return; return;
......
...@@ -5,14 +5,6 @@ ...@@ -5,14 +5,6 @@
#define KUAP_READ 1 #define KUAP_READ 1
#define KUAP_WRITE 2 #define KUAP_WRITE 2
#define KUAP_READ_WRITE (KUAP_READ | KUAP_WRITE) #define KUAP_READ_WRITE (KUAP_READ | KUAP_WRITE)
/*
* For prevent_user_access() only.
* Use the current saved situation instead of the to/from/size params.
* Used on book3s/32
*/
#define KUAP_CURRENT_READ 4
#define KUAP_CURRENT_WRITE 8
#define KUAP_CURRENT (KUAP_CURRENT_READ | KUAP_CURRENT_WRITE)
#ifdef CONFIG_PPC_BOOK3S_64 #ifdef CONFIG_PPC_BOOK3S_64
#include <asm/book3s/64/kup.h> #include <asm/book3s/64/kup.h>
...@@ -129,17 +121,17 @@ static inline void prevent_read_write_user(void __user *to, const void __user *f ...@@ -129,17 +121,17 @@ static inline void prevent_read_write_user(void __user *to, const void __user *f
static inline void prevent_current_access_user(void) static inline void prevent_current_access_user(void)
{ {
prevent_user_access(NULL, NULL, ~0UL, KUAP_CURRENT); prevent_user_access(NULL, NULL, ~0UL, KUAP_READ_WRITE);
} }
static inline void prevent_current_read_from_user(void) static inline void prevent_current_read_from_user(void)
{ {
prevent_user_access(NULL, NULL, ~0UL, KUAP_CURRENT_READ); prevent_user_access(NULL, NULL, ~0UL, KUAP_READ);
} }
static inline void prevent_current_write_to_user(void) static inline void prevent_current_write_to_user(void)
{ {
prevent_user_access(NULL, NULL, ~0UL, KUAP_CURRENT_WRITE); prevent_user_access(NULL, NULL, ~0UL, KUAP_WRITE);
} }
#endif /* !__ASSEMBLY__ */ #endif /* !__ASSEMBLY__ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment