Skip to content

Commit db080f9

Browse files
committed
parisc: let probe_kernel_read() capture access to page zero
Signed-off-by: Helge Deller <[email protected]>
1 parent 2d8b22d commit db080f9

File tree

1 file changed

+14
-1
lines changed

1 file changed

+14
-1
lines changed

arch/parisc/lib/memcpy.c

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
#ifdef __KERNEL__
5757
#include <linux/module.h>
5858
#include <linux/compiler.h>
59-
#include <asm/uaccess.h>
59+
#include <linux/uaccess.h>
6060
#define s_space "%%sr1"
6161
#define d_space "%%sr2"
6262
#else
@@ -524,4 +524,17 @@ EXPORT_SYMBOL(copy_to_user);
524524
EXPORT_SYMBOL(copy_from_user);
525525
EXPORT_SYMBOL(copy_in_user);
526526
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+
527540
#endif

0 commit comments

Comments
 (0)