Skip to content

Commit 2db48d8

Browse files
KAGA-KOKOingomolnar
authored andcommitted
arm64: uaccess: Use unsafe wrappers for ASM GOTO
Clang propagates a provided label, which is outside of a cleanup scope to ASM GOTO despite the fact that __raw_get_mem() has a local label for that purpose: "error: cannot jump from this asm goto statement to one of its possible targets" Using the unsafe wrapper with the extra local label indirection cures that. Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Reported-by: kernel test robot <lkp@intel.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Signed-off-by: Ingo Molnar <mingo@kernel.org>
1 parent 43cc54d commit 2db48d8

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

arch/arm64/include/asm/uaccess.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -422,9 +422,9 @@ static __must_check __always_inline bool user_access_begin(const void __user *pt
422422
}
423423
#define user_access_begin(a,b) user_access_begin(a,b)
424424
#define user_access_end() uaccess_ttbr0_disable()
425-
#define unsafe_put_user(x, ptr, label) \
425+
#define arch_unsafe_put_user(x, ptr, label) \
426426
__raw_put_mem("sttr", x, uaccess_mask_ptr(ptr), label, U)
427-
#define unsafe_get_user(x, ptr, label) \
427+
#define arch_unsafe_get_user(x, ptr, label) \
428428
__raw_get_mem("ldtr", x, uaccess_mask_ptr(ptr), label, U)
429429

430430
/*

0 commit comments

Comments
 (0)