@@ -102,23 +102,28 @@ static inline void kuap_update_sr(u32 sr, u32 addr, u32 end)
isync(); /* Context sync required after mtsrin() */
}
-static __always_inline void allow_user_access(void __user *to, const void __user *from,
- u32 size, unsigned long dir)
+/* Make sure we never return 0. We only use top and bottom 4 bits */
+static __always_inline unsigned long
+allow_user_access(void __user *to, const void __user *from, u32 size, unsigned long dir)
{
u32 addr, end;
+ unsigned long kuap;
BUILD_BUG_ON(!__builtin_constant_p(dir));
if (!(dir & KUAP_W))
- return;
+ return 0x100;
addr = (__force u32)to;
if (unlikely(addr >= TASK_SIZE || !size))
- return;
+ return 0x100;
end = min(addr + size, TASK_SIZE);
- current->thread.kuap = (addr & 0xf0000000) | ((((end - 1) >> 28) + 1) & 0xf);
+ kuap = (addr & 0xf0000000) | ((((end - 1) >> 28) + 1) & 0xf);
+ current->thread.kuap = kuap;
kuap_update_sr(mfsrin(addr) & ~SR_KS, addr, end); /* Clear Ks */
+
+ return kuap;
}
static __always_inline void prevent_user_access(void __user *to, const void __user *from,
@@ -77,8 +77,9 @@ static inline void set_kuap(unsigned long value)
isync();
}
-static __always_inline void allow_user_access(void __user *to, const void __user *from,
- unsigned long size, unsigned long dir)
+static __always_inline unsigned long
+allow_user_access(void __user *to, const void __user *from,
+ unsigned long size, unsigned long dir)
{
// This is written so we can resolve to a single case at build time
BUILD_BUG_ON(!__builtin_constant_p(dir));
@@ -88,6 +89,8 @@ static __always_inline void allow_user_access(void __user *to, const void __user
set_kuap(AMR_KUAP_BLOCK_READ);
else
set_kuap(0);
+
+ return 1;
}
static inline void prevent_user_access(void __user *to, const void __user *from,
@@ -45,8 +45,12 @@ static inline void setup_kuep(bool disabled) { }
void setup_kuap(bool disabled);
#else
static inline void setup_kuap(bool disabled) { }
-static inline void allow_user_access(void __user *to, const void __user *from,
- unsigned long size, unsigned long dir) { }
+static inline unsigned long allow_user_access(void __user *to, const void __user *from,
+ unsigned long size, unsigned long dir)
+{
+ return 1;
+}
+
static inline void prevent_user_access(void __user *to, const void __user *from,
unsigned long size, unsigned long dir) { }
static inline bool
@@ -34,10 +34,12 @@
#include <asm/reg.h>
-static inline void allow_user_access(void __user *to, const void __user *from,
- unsigned long size, unsigned long dir)
+static inline unsigned long allow_user_access(void __user *to, const void __user *from,
+ unsigned long size, unsigned long dir)
{
mtspr(SPRN_MD_AP, MD_APG_INIT);
+
+ return 1;
}
static inline void prevent_user_access(void __user *to, const void __user *from,
In preparation of implementing user_access_begin and friends on powerpc, allow_user_access() need to be prepared for user_access_begin() user_access_end() doesn't provide the address and size which were passed to user_access_begin(), required by prevent_user_access() to know which segment to modify. But user_access_end() takes an opaque value returned by user_access_begin(). Make allow_user_access() return the value it writes to current->kuap. This will allow user_access_end() to recalculate the segment range without having to read current->kuap. Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> --- v3: Replaces the patch "Prepare prevent_user_access() for user_access_end()" --- arch/powerpc/include/asm/book3s/32/kup.h | 15 ++++++++++----- arch/powerpc/include/asm/book3s/64/kup-radix.h | 7 +++++-- arch/powerpc/include/asm/kup.h | 8 ++++++-- arch/powerpc/include/asm/nohash/32/kup-8xx.h | 6 ++++-- 4 files changed, 25 insertions(+), 11 deletions(-)