linux-user: Use memcpy in get_user/put_user.
When host and target have differing alignment rules, using a cast and direct memory operation can result in SIGBUS. Use memcpy instead, which the compiler will happily optimize when alignment is satisfied. Signed-off-by: Richard Henderson <rth@twiddle.net> Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
parent
cfb75cb980
commit
62724cc5eb
|
@ -289,46 +289,29 @@ static inline int access_ok(int type, abi_ulong addr, abi_ulong size)
|
||||||
* struct has been locked - usually with lock_user_struct().
|
* struct has been locked - usually with lock_user_struct().
|
||||||
*/
|
*/
|
||||||
#define __put_user(x, hptr)\
|
#define __put_user(x, hptr)\
|
||||||
({\
|
({ __typeof(*hptr) pu_ = (x);\
|
||||||
switch(sizeof(*hptr)) {\
|
switch(sizeof(*hptr)) {\
|
||||||
case 1:\
|
case 1: break;\
|
||||||
*(uint8_t *)(hptr) = (uint8_t)(typeof(*hptr))(x);\
|
case 2: pu_ = tswap16(pu_); break; \
|
||||||
break;\
|
case 4: pu_ = tswap32(pu_); break; \
|
||||||
case 2:\
|
case 8: pu_ = tswap64(pu_); break; \
|
||||||
*(uint16_t *)(hptr) = tswap16((uint16_t)(typeof(*hptr))(x));\
|
default: abort();\
|
||||||
break;\
|
|
||||||
case 4:\
|
|
||||||
*(uint32_t *)(hptr) = tswap32((uint32_t)(typeof(*hptr))(x));\
|
|
||||||
break;\
|
|
||||||
case 8:\
|
|
||||||
*(uint64_t *)(hptr) = tswap64((typeof(*hptr))(x));\
|
|
||||||
break;\
|
|
||||||
default:\
|
|
||||||
abort();\
|
|
||||||
}\
|
}\
|
||||||
|
memcpy(hptr, &pu_, sizeof(pu_)); \
|
||||||
0;\
|
0;\
|
||||||
})
|
})
|
||||||
|
|
||||||
#define __get_user(x, hptr) \
|
#define __get_user(x, hptr) \
|
||||||
({\
|
({ __typeof(*hptr) gu_; \
|
||||||
|
memcpy(&gu_, hptr, sizeof(gu_)); \
|
||||||
switch(sizeof(*hptr)) {\
|
switch(sizeof(*hptr)) {\
|
||||||
case 1:\
|
case 1: break; \
|
||||||
x = (typeof(*hptr))*(uint8_t *)(hptr);\
|
case 2: gu_ = tswap16(gu_); break; \
|
||||||
break;\
|
case 4: gu_ = tswap32(gu_); break; \
|
||||||
case 2:\
|
case 8: gu_ = tswap64(gu_); break; \
|
||||||
x = (typeof(*hptr))tswap16(*(uint16_t *)(hptr));\
|
default: abort();\
|
||||||
break;\
|
|
||||||
case 4:\
|
|
||||||
x = (typeof(*hptr))tswap32(*(uint32_t *)(hptr));\
|
|
||||||
break;\
|
|
||||||
case 8:\
|
|
||||||
x = (typeof(*hptr))tswap64(*(uint64_t *)(hptr));\
|
|
||||||
break;\
|
|
||||||
default:\
|
|
||||||
/* avoid warning */\
|
|
||||||
x = 0;\
|
|
||||||
abort();\
|
|
||||||
}\
|
}\
|
||||||
|
(x) = gu_; \
|
||||||
0;\
|
0;\
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue