arm64: Add brackets around user_stack_pointer()
authorCatalin Marinas <catalin.marinas@arm.com>
Fri, 29 Aug 2014 15:08:02 +0000 (16:08 +0100)
committerMark Brown <broonie@kernel.org>
Thu, 22 Jan 2015 21:56:46 +0000 (21:56 +0000)
Commit 5f888a1d33 (ARM64: perf: support dwarf unwinding in compat mode)
changes user_stack_pointer() to return the compat SP for 32-bit tasks
but without brackets around the whole definition, with possible issues
on the call sites (noticed with a subsequent fix for KSTK_ESP).

Fixes: 5f888a1d33c4 (ARM64: perf: support dwarf unwinding in compat mode)
Reported-by: Sudeep Holla <sudeep.holla@arm.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
(cherry picked from commit 2520d039728b2a3c5ae7f79fe2a0e9d182855b12)
Signed-off-by: Mark Brown <broonie@kernel.org>
arch/arm64/include/asm/ptrace.h

index b8e7cf199ce687df23fe039f4a66d69e834af81e..47d0ab177f7ea8e2066a92fa15e34b69e9dae5a1 100644 (file)
@@ -132,7 +132,7 @@ struct pt_regs {
        (!((regs)->pstate & PSR_F_BIT))
 
 #define user_stack_pointer(regs) \
-       (!compat_user_mode(regs)) ? ((regs)->sp) : ((regs)->compat_sp)
+       (!compat_user_mode(regs) ? (regs)->sp : (regs)->compat_sp)
 
 /*
  * Are the current registers suitable for user mode? (used to maintain