Commit 13e28a1b authored by Mark Rutland's avatar Mark Rutland Committed by Sasha Levin

arm64: armv8_deprecated: ensure extension of addr

[ Upstream commit 55de49f9 ]

Our compat swp emulation holds the compat user address in an unsigned
int, which it passes to __user_swpX_asm(). When a 32-bit value is passed
in a register, the upper 32 bits of the register are unknown, and we
must extend the value to 64 bits before we can use it as a base address.

This patch casts the address to unsigned long to ensure it has been
suitably extended, avoiding the potential issue, and silencing a related
warning from clang.

Fixes: bd35a4ad ("arm64: Port SWP/SWPB emulation support from arm")
Cc: <stable@vger.kernel.org> # 3.19.x-
Acked-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarMark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
parent a021c812
...@@ -298,7 +298,8 @@ static void register_insn_emulation_sysctl(struct ctl_table *table) ...@@ -298,7 +298,8 @@ static void register_insn_emulation_sysctl(struct ctl_table *table)
" .quad 1b, 4b\n" \ " .quad 1b, 4b\n" \
" .popsection\n" \ " .popsection\n" \
: "=&r" (res), "+r" (data), "=&r" (temp) \ : "=&r" (res), "+r" (data), "=&r" (temp) \
: "r" (addr), "i" (-EAGAIN), "i" (-EFAULT) \ : "r" ((unsigned long)addr), "i" (-EAGAIN), \
"i" (-EFAULT) \
: "memory") : "memory")
#define __user_swp_asm(data, addr, res, temp) \ #define __user_swp_asm(data, addr, res, temp) \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment