diff options
| author | Helge Deller <deller@gmx.de> | 2013-10-09 17:47:03 -0400 |
|---|---|---|
| committer | Helge Deller <deller@gmx.de> | 2013-10-13 11:46:31 -0400 |
| commit | db080f9c530f78dad661257885a1893506077068 (patch) | |
| tree | 8bd6402f4e06a271937f2dd3ed70e9de7ffee081 | |
| parent | 2d8b22de6e5241a6f27f7f290f027223156a7d3f (diff) | |
parisc: let probe_kernel_read() capture access to page zero
Signed-off-by: Helge Deller <deller@gmx.de>
| -rw-r--r-- | arch/parisc/lib/memcpy.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/arch/parisc/lib/memcpy.c b/arch/parisc/lib/memcpy.c index ac4370b1ca40..b5507ec06b84 100644 --- a/arch/parisc/lib/memcpy.c +++ b/arch/parisc/lib/memcpy.c | |||
| @@ -56,7 +56,7 @@ | |||
| 56 | #ifdef __KERNEL__ | 56 | #ifdef __KERNEL__ |
| 57 | #include <linux/module.h> | 57 | #include <linux/module.h> |
| 58 | #include <linux/compiler.h> | 58 | #include <linux/compiler.h> |
| 59 | #include <asm/uaccess.h> | 59 | #include <linux/uaccess.h> |
| 60 | #define s_space "%%sr1" | 60 | #define s_space "%%sr1" |
| 61 | #define d_space "%%sr2" | 61 | #define d_space "%%sr2" |
| 62 | #else | 62 | #else |
| @@ -524,4 +524,17 @@ EXPORT_SYMBOL(copy_to_user); | |||
| 524 | EXPORT_SYMBOL(copy_from_user); | 524 | EXPORT_SYMBOL(copy_from_user); |
| 525 | EXPORT_SYMBOL(copy_in_user); | 525 | EXPORT_SYMBOL(copy_in_user); |
| 526 | EXPORT_SYMBOL(memcpy); | 526 | EXPORT_SYMBOL(memcpy); |
| 527 | |||
| 528 | long probe_kernel_read(void *dst, const void *src, size_t size) | ||
| 529 | { | ||
| 530 | unsigned long addr = (unsigned long)src; | ||
| 531 | |||
| 532 | if (size < 0 || addr < PAGE_SIZE) | ||
| 533 | return -EFAULT; | ||
| 534 | |||
| 535 | /* check for I/O space F_EXTEND(0xfff00000) access as well? */ | ||
| 536 | |||
| 537 | return __probe_kernel_read(dst, src, size); | ||
| 538 | } | ||
| 539 | |||
| 527 | #endif | 540 | #endif |
