Skip to content

Commit 43cc54d

Browse files
KAGA-KOKOPeter Zijlstra
authored andcommitted
s390/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. S390 is not affected for unsafe_*_user() as it uses its own local label already, but __get/put_kernel_nofault() lack that. Rename them to arch_*_kernel_nofault() which makes the generic uaccess header wrap it with a local label that makes both compilers emit correct code. 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> Acked-by: Heiko Carstens <hca@linux.ibm.com> Link: https://patch.msgid.link/20251027083745.483079889@linutronix.de
1 parent 0988ea1 commit 43cc54d

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

arch/s390/include/asm/uaccess.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -468,8 +468,8 @@ do { \
468468

469469
#endif /* CONFIG_CC_HAS_ASM_GOTO_OUTPUT && CONFIG_CC_HAS_ASM_AOR_FORMAT_FLAGS */
470470

471-
#define __get_kernel_nofault __mvc_kernel_nofault
472-
#define __put_kernel_nofault __mvc_kernel_nofault
471+
#define arch_get_kernel_nofault __mvc_kernel_nofault
472+
#define arch_put_kernel_nofault __mvc_kernel_nofault
473473

474474
void __cmpxchg_user_key_called_with_bad_pointer(void);
475475

0 commit comments

Comments
 (0)