Commit d717623a authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] /proc/kcore: handle unmapped areas

From: Andi Kleen <ak@suse.de>

On i386 and most other ports kern_addr_valid is hardcoded to 1.

This works fine as long as only mapped areas are accessed.  When you have
something partially mapped in the kclist it is possible that start points to
an unmapped address.  The correct behaviour in this case is to zero the user
space.  We shouldn't return -EFAULT because the fault is against the mmapped
range, not against the user's address.

copy_to_user usually even checks for exceptions on both source and
destination, but it does not zero the destination in this case and worse
results in EFAULT, which is user visible.

This patch just tries to clear_user in this case again to actually zero the
user data and catch real user side EFAULTs.

Another way to fix this is to have kern_addr_valid do a real page table
lookup (I did that on AMD64), but having this fallback is a bit more
reliable in case there is a race somewhere.

On i386 it could happen for example if the direct space to max_low_pfn
contains something unmapped.  This normally isn't the case, but e.g.  the
slab debugging patches in -mm* do this so it's better to handle it.

Drawback is that it relies on a somewhat undocumented copy_to_user behaviour
(fault on both source and destination).  It is true for i386 and amd64, but I
don't know if it is for other port.  In the worst case they just don't have
the race protection and may see bogus EFAULTs.
parent 98c94255
...@@ -451,8 +451,20 @@ static ssize_t read_kcore(struct file *file, char *buffer, size_t buflen, loff_t ...@@ -451,8 +451,20 @@ static ssize_t read_kcore(struct file *file, char *buffer, size_t buflen, loff_t
kfree(elf_buf); kfree(elf_buf);
} else { } else {
if (kern_addr_valid(start)) { if (kern_addr_valid(start)) {
if (copy_to_user(buffer, (char *)start, tsz)) unsigned long n;
return -EFAULT;
n = copy_to_user(buffer, (char *)start, tsz);
/*
* We cannot distingush between fault on source
* and fault on destination. When this happens
* we clear too and hope it will trigger the
* EFAULT again.
*/
if (n) {
if (clear_user(buffer + tsz - n,
tsz - n))
return -EFAULT;
}
} else { } else {
if (clear_user(buffer, tsz)) if (clear_user(buffer, tsz))
return -EFAULT; return -EFAULT;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment