summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSonic Zhang <sonic.adi@gmail.com>2006-09-27 01:50:17 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-27 08:26:14 -0700
commit910e46da4b4e93d56ffea318c64afa41868d5e6d (patch)
tree67f7dd9086dcf456101c843a1e310e7090a590db
parent0159b141d8b1f9b9f9cffacae47bec1e05c63b8b (diff)
downloadop-kernel-dev-910e46da4b4e93d56ffea318c64afa41868d5e6d.zip
op-kernel-dev-910e46da4b4e93d56ffea318c64afa41868d5e6d.tar.gz
[PATCH] Check if start address is in vma region in NOMMU function get_user_pages()
In NOMMU arch, if run "cat /proc/self/mem", data from physical address 0 are read. This behavior is different from MMU arch. In IA32, message "cat: /proc/self/mem: Input/output error" is reported. This issue is rootcaused by not validate the start address in NOMMU function get_user_pages(). Following patch solves this issue. Signed-off-by: Sonic Zhang <sonic.adi@gmail.com> Cc: David Howells <dhowells@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--mm/nommu.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/mm/nommu.c b/mm/nommu.c
index 00ffa97..2af5083 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -129,16 +129,20 @@ int get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
struct page **pages, struct vm_area_struct **vmas)
{
int i;
- static struct vm_area_struct dummy_vma;
+ struct vm_area_struct *vma;
for (i = 0; i < len; i++) {
+ vma = find_vma(mm, start);
+ if(!vma)
+ return i ? : -EFAULT;
+
if (pages) {
pages[i] = virt_to_page(start);
if (pages[i])
page_cache_get(pages[i]);
}
if (vmas)
- vmas[i] = &dummy_vma;
+ vmas[i] = vma;
start += PAGE_SIZE;
}
return(i);
OpenPOWER on IntegriCloud