Skip to content

Commit c76f39b

Browse files
aegltorvalds
authored andcommitted
ia64: fix futex_atomic_cmpxchg_inatomic()
Michel Lespinasse cleaned up the futex calling conventions in commit 37a9d91 ("futex: Sanitize cmpxchg_futex_value_locked API"). But the ia64 implementation was subtly broken. Gcc does not know that register "r8" will be updated by the fault handler if the cmpxchg instruction takes an exception. So it feels safe in letting the initialization of r8 slide to after the cmpxchg. Result: we always return 0 whether the user address faulted or not. Fix by moving the initialization of r8 into the __asm__ code so gcc won't move it. Reported-by: <[email protected]> Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=42757 Tested-by: <[email protected]> Acked-by: Michel Lespinasse <[email protected]> Cc: [email protected] # v2.6.39+ Signed-off-by: Tony Luck <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent c06a9eb commit c76f39b

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

arch/ia64/include/asm/futex.h

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,15 +106,16 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
106106
return -EFAULT;
107107

108108
{
109-
register unsigned long r8 __asm ("r8") = 0;
109+
register unsigned long r8 __asm ("r8");
110110
unsigned long prev;
111111
__asm__ __volatile__(
112112
" mf;; \n"
113-
" mov ar.ccv=%3;; \n"
114-
"[1:] cmpxchg4.acq %0=[%1],%2,ar.ccv \n"
113+
" mov %0=r0 \n"
114+
" mov ar.ccv=%4;; \n"
115+
"[1:] cmpxchg4.acq %1=[%2],%3,ar.ccv \n"
115116
" .xdata4 \"__ex_table\", 1b-., 2f-. \n"
116117
"[2:]"
117-
: "=r" (prev)
118+
: "=r" (r8), "=r" (prev)
118119
: "r" (uaddr), "r" (newval),
119120
"rO" ((long) (unsigned) oldval)
120121
: "memory");

0 commit comments

Comments
 (0)