leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sh: Proper __put_user_asm() size mismatch fix.

Browse Source 
This fixes up the workaround in 2b4b2bb421
and cleans up __put_user_asm() to get the sizing right from the onset.

Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
OGAWA Hirofumi 2008-07-29 09:16:33 +09:00 committed by Paul Mundt
parent d27e0854d5
commit 6de9c6481d
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/sh/include/asm/uaccess.h
View File

@ -77,8 +77,9 @@ struct __large_struct { unsigned long buf[100]; };
({ \
long __pu_err; \
__typeof__(*(ptr)) __user *__pu_addr = (ptr); \
__typeof__(*(ptr)) __pu_val = x; \
__chk_user_ptr(ptr); \
__put_user_size((x), __pu_addr, (size), __pu_err); \
__put_user_size(__pu_val, __pu_addr, (size), __pu_err); \
__pu_err; \
})
@ -86,8 +87,9 @@ struct __large_struct { unsigned long buf[100]; };
({ \
long __pu_err = -EFAULT; \
__typeof__(*(ptr)) __user *__pu_addr = (ptr); \
__typeof__(*(ptr)) __pu_val = x; \
if (likely(access_ok(VERIFY_WRITE, __pu_addr, size))) \
__put_user_size((x), __pu_addr, (size), \
__put_user_size(__pu_val, __pu_addr, (size), \
__pu_err); \
__pu_err; \
})

3
arch/sh/include/asm/uaccess_32.h
View File

@ -76,8 +76,7 @@ do { \
__put_user_asm(x, ptr, retval, "w"); \
break; \
case 4: \
__put_user_asm((u32)x, ptr, \
retval, "l"); \
__put_user_asm(x, ptr, retval, "l"); \
break; \
case 8: \
__put_user_u64(x, ptr, retval); \