diff options
author | David Howells <dhowells@redhat.com> | 2006-09-27 04:50:15 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-27 11:26:14 -0400 |
commit | 0ec76a110f432e98277e464b82ace8dd66571689 (patch) | |
tree | 3ed8de0ea6869fe17bec7689c493a2db02f73f4a /mm/memory.c | |
parent | 361f6ed1d00f666a1a7c33f3e9aaccb713f9b9e4 (diff) |
[PATCH] NOMMU: Check that access_process_vm() has a valid target
Check that access_process_vm() is accessing a valid mapping in the target
process.
This limits ptrace() accesses and accesses through /proc/<pid>/maps to only
those regions actually mapped by a program.
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'mm/memory.c')
-rw-r--r-- | mm/memory.c | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/mm/memory.c b/mm/memory.c index f2ef1dcfff7..601159a46ab 100644 --- a/mm/memory.c +++ b/mm/memory.c | |||
@@ -2604,3 +2604,56 @@ int in_gate_area_no_task(unsigned long addr) | |||
2604 | } | 2604 | } |
2605 | 2605 | ||
2606 | #endif /* __HAVE_ARCH_GATE_AREA */ | 2606 | #endif /* __HAVE_ARCH_GATE_AREA */ |
2607 | |||
2608 | /* | ||
2609 | * Access another process' address space. | ||
2610 | * Source/target buffer must be kernel space, | ||
2611 | * Do not walk the page table directly, use get_user_pages | ||
2612 | */ | ||
2613 | int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write) | ||
2614 | { | ||
2615 | struct mm_struct *mm; | ||
2616 | struct vm_area_struct *vma; | ||
2617 | struct page *page; | ||
2618 | void *old_buf = buf; | ||
2619 | |||
2620 | mm = get_task_mm(tsk); | ||
2621 | if (!mm) | ||
2622 | return 0; | ||
2623 | |||
2624 | down_read(&mm->mmap_sem); | ||
2625 | /* ignore errors, just check how much was sucessfully transfered */ | ||
2626 | while (len) { | ||
2627 | int bytes, ret, offset; | ||
2628 | void *maddr; | ||
2629 | |||
2630 | ret = get_user_pages(tsk, mm, addr, 1, | ||
2631 | write, 1, &page, &vma); | ||
2632 | if (ret <= 0) | ||
2633 | break; | ||
2634 | |||
2635 | bytes = len; | ||
2636 | offset = addr & (PAGE_SIZE-1); | ||
2637 | if (bytes > PAGE_SIZE-offset) | ||
2638 | bytes = PAGE_SIZE-offset; | ||
2639 | |||
2640 | maddr = kmap(page); | ||
2641 | if (write) { | ||
2642 | copy_to_user_page(vma, page, addr, | ||
2643 | maddr + offset, buf, bytes); | ||
2644 | set_page_dirty_lock(page); | ||
2645 | } else { | ||
2646 | copy_from_user_page(vma, page, addr, | ||
2647 | buf, maddr + offset, bytes); | ||
2648 | } | ||
2649 | kunmap(page); | ||
2650 | page_cache_release(page); | ||
2651 | len -= bytes; | ||
2652 | buf += bytes; | ||
2653 | addr += bytes; | ||
2654 | } | ||
2655 | up_read(&mm->mmap_sem); | ||
2656 | mmput(mm); | ||
2657 | |||
2658 | return buf - old_buf; | ||
2659 | } | ||