Skip to content

Commit 5002dd5

Browse files
KAGA-KOKOPeter Zijlstra
authored andcommitted
powerpc/uaccess: Use unsafe wrappers for ASM GOTO
ASM GOTO is miscompiled by GCC when it is used inside a auto cleanup scope: bool foo(u32 __user *p, u32 val) { scoped_guard(pagefault) unsafe_put_user(val, p, efault); return true; efault: return false; } It ends up leaking the pagefault disable counter in the fault path. clang at least fails the build. Rename unsafe_*_user() to arch_unsafe_*_user() which makes the generic uaccess header wrap it with a local label that makes both compilers emit correct code. Same for the kernel_nofault() variants. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Reviewed-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Link: https://patch.msgid.link/20251027083745.356628509@linutronix.de
1 parent 1421939 commit 5002dd5

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

arch/powerpc/include/asm/uaccess.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -451,15 +451,15 @@ user_write_access_begin(const void __user *ptr, size_t len)
451451
#define user_write_access_begin user_write_access_begin
452452
#define user_write_access_end prevent_current_write_to_user
453453

454-
#define unsafe_get_user(x, p, e) do { \
454+
#define arch_unsafe_get_user(x, p, e) do { \
455455
__long_type(*(p)) __gu_val; \
456456
__typeof__(*(p)) __user *__gu_addr = (p); \
457457
\
458458
__get_user_size_goto(__gu_val, __gu_addr, sizeof(*(p)), e); \
459459
(x) = (__typeof__(*(p)))__gu_val; \
460460
} while (0)
461461

462-
#define unsafe_put_user(x, p, e) \
462+
#define arch_unsafe_put_user(x, p, e) \
463463
__put_user_size_goto((__typeof__(*(p)))(x), (p), sizeof(*(p)), e)
464464

465465
#define unsafe_copy_from_user(d, s, l, e) \
@@ -504,11 +504,11 @@ do { \
504504
unsafe_put_user(*(u8*)(_src + _i), (u8 __user *)(_dst + _i), e); \
505505
} while (0)
506506

507-
#define __get_kernel_nofault(dst, src, type, err_label) \
507+
#define arch_get_kernel_nofault(dst, src, type, err_label) \
508508
__get_user_size_goto(*((type *)(dst)), \
509509
(__force type __user *)(src), sizeof(type), err_label)
510510

511-
#define __put_kernel_nofault(dst, src, type, err_label) \
511+
#define arch_put_kernel_nofault(dst, src, type, err_label) \
512512
__put_user_size_goto(*((type *)(src)), \
513513
(__force type __user *)(dst), sizeof(type), err_label)
514514

0 commit comments

Comments
 (0)