Skip to content

Commit

Permalink
[PATCH] NOMMU: Use find_vma() rather than reimplementing a VMA search
Browse files Browse the repository at this point in the history
Use find_vma() in the NOMMU version of access_process_vm() rather than
reimplementing it.

Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
David Howells authored and Linus Torvalds committed Sep 27, 2006
1 parent 5da6185 commit 0159b14
Showing 1 changed file with 3 additions and 8 deletions.
11 changes: 3 additions & 8 deletions mm/nommu.c
Original file line number Diff line number Diff line change
Expand Up @@ -1039,6 +1039,7 @@ unsigned long do_mremap(unsigned long addr,

/*
* Look up the first VMA which satisfies addr < vm_end, NULL if none
* - should be called with mm->mmap_sem at least readlocked
*/
struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
{
Expand Down Expand Up @@ -1213,7 +1214,6 @@ struct page *filemap_nopage(struct vm_area_struct *area,
*/
int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write)
{
struct vm_list_struct *vml;
struct vm_area_struct *vma;
struct mm_struct *mm;

Expand All @@ -1227,13 +1227,8 @@ int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, in
down_read(&mm->mmap_sem);

/* the access must start within one of the target process's mappings */
for (vml = mm->context.vmlist; vml; vml = vml->next)
if (addr >= vml->vma->vm_start && addr < vml->vma->vm_end)
break;

if (vml) {
vma = vml->vma;

vma = find_vma(mm, addr);
if (vma) {
/* don't overrun this mapping */
if (addr + len >= vma->vm_end)
len = vma->vm_end - addr;
Expand Down

0 comments on commit 0159b14

Please sign in to comment.