mirror of
https://github.com/torvalds/linux.git
synced 2026-11-07 06:17:02 +01:00
sh: uaccess: Require offsettable operands for 64-bit user access
The 64-bit __get_user_u64()/__put_user_u64() paths address the memory
operand as %T2 (base+4). This base+4 requires an offsettable address,
but "m" also allows the indexed mode @(R0,Rn) (e.g. for a variable-
indexed array element), which has no displacement field for the +4.
Depending on optimization this build fails with "invalid 'asm'" or an
ICE in GCC's change_address_1.
Require an offsettable memory operand, allowing GCC to reload an
unsuitable indexed address into an appropriate form.
Fixes: 2d2b308a8b ("sh: Implement __get_user_u64() required for 64-bit get_user()")
Signed-off-by: Florian Fuchs <fuchsfl@gmail.com>
Reviewed-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Signed-off-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
This commit is contained in:
parent
642c9b8ee6
commit
8b5dba9ea4
|
|
@ -92,7 +92,7 @@ __asm__ __volatile__( \
|
|||
".long 1b + 2, 3b\n\t" \
|
||||
".previous" \
|
||||
:"=&r" (err), "=&r" (x) \
|
||||
:"m" (__m(addr)), "i" (-EFAULT), "0" (err)); })
|
||||
:"o" (__m(addr)), "i" (-EFAULT), "0" (err)); })
|
||||
#else
|
||||
#define __get_user_u64(x, addr, err) \
|
||||
({ \
|
||||
|
|
@ -116,7 +116,7 @@ __asm__ __volatile__( \
|
|||
".long 1b + 2, 3b\n\t" \
|
||||
".previous" \
|
||||
:"=&r" (err), "=&r" (x) \
|
||||
:"m" (__m(addr)), "i" (-EFAULT), "0" (err)); })
|
||||
:"o" (__m(addr)), "i" (-EFAULT), "0" (err)); })
|
||||
#endif
|
||||
|
||||
#define __put_user_size(x,ptr,size,retval) \
|
||||
|
|
@ -196,7 +196,7 @@ __asm__ __volatile__( \
|
|||
".long 1b, 3b\n\t" \
|
||||
".previous" \
|
||||
: "=r" (retval) \
|
||||
: "r" (val), "m" (__m(addr)), "i" (-EFAULT), "0" (retval) \
|
||||
: "r" (val), "o" (__m(addr)), "i" (-EFAULT), "0" (retval) \
|
||||
: "memory"); })
|
||||
#else
|
||||
#define __put_user_u64(val,addr,retval) \
|
||||
|
|
@ -218,7 +218,7 @@ __asm__ __volatile__( \
|
|||
".long 1b, 3b\n\t" \
|
||||
".previous" \
|
||||
: "=r" (retval) \
|
||||
: "r" (val), "m" (__m(addr)), "i" (-EFAULT), "0" (retval) \
|
||||
: "r" (val), "o" (__m(addr)), "i" (-EFAULT), "0" (retval) \
|
||||
: "memory"); })
|
||||
#endif
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user