diff options
| -rw-r--r-- | arch/arm64/include/asm/uaccess.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm64/include/asm/uaccess.h b/arch/arm64/include/asm/uaccess.h index edb3d5c73a32..7ecc2b23882e 100644 --- a/arch/arm64/include/asm/uaccess.h +++ b/arch/arm64/include/asm/uaccess.h | |||
| @@ -166,9 +166,10 @@ do { \ | |||
| 166 | 166 | ||
| 167 | #define get_user(x, ptr) \ | 167 | #define get_user(x, ptr) \ |
| 168 | ({ \ | 168 | ({ \ |
| 169 | __typeof__(*(ptr)) __user *__p = (ptr); \ | ||
| 169 | might_fault(); \ | 170 | might_fault(); \ |
| 170 | access_ok(VERIFY_READ, (ptr), sizeof(*(ptr))) ? \ | 171 | access_ok(VERIFY_READ, __p, sizeof(*__p)) ? \ |
| 171 | __get_user((x), (ptr)) : \ | 172 | __get_user((x), __p) : \ |
| 172 | ((x) = 0, -EFAULT); \ | 173 | ((x) = 0, -EFAULT); \ |
| 173 | }) | 174 | }) |
| 174 | 175 | ||
| @@ -227,9 +228,10 @@ do { \ | |||
| 227 | 228 | ||
| 228 | #define put_user(x, ptr) \ | 229 | #define put_user(x, ptr) \ |
| 229 | ({ \ | 230 | ({ \ |
| 231 | __typeof__(*(ptr)) __user *__p = (ptr); \ | ||
| 230 | might_fault(); \ | 232 | might_fault(); \ |
| 231 | access_ok(VERIFY_WRITE, (ptr), sizeof(*(ptr))) ? \ | 233 | access_ok(VERIFY_WRITE, __p, sizeof(*__p)) ? \ |
| 232 | __put_user((x), (ptr)) : \ | 234 | __put_user((x), __p) : \ |
| 233 | -EFAULT; \ | 235 | -EFAULT; \ |
| 234 | }) | 236 | }) |
| 235 | 237 | ||