mm: add get_dump_page

[pandora-kernel.git] / fs / binfmt_elf_fdpic.c

diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c
index 20fbece..7628547 100644 (file)
--- a/fs/binfmt_elf_fdpic.c
+++ b/fs/binfmt_elf_fdpic.c
@@ -1325,9 +1325,6 @@ static int writenote(struct memelfnote *men, struct file *file)
 #define DUMP_WRITE(addr, nr)   \
        if ((size += (nr)) > limit || !dump_write(file, (addr), (nr))) \
                goto end_coredump;
-#define DUMP_SEEK(off) \
-       if (!dump_seek(file, (off))) \
-               goto end_coredump;
 
 static inline void fill_elf_fdpic_header(struct elfhdr *elf, int segs)
 {
@@ -1518,6 +1515,7 @@ static int elf_fdpic_dump_segments(struct file *file, size_t *size,
                           unsigned long *limit, unsigned long mm_flags)
 {
        struct vm_area_struct *vma;
+       int err = 0;
 
        for (vma = current->mm->mmap; vma; vma = vma->vm_next) {
                unsigned long addr;
@@ -1525,43 +1523,26 @@ static int elf_fdpic_dump_segments(struct file *file, size_t *size,
                if (!maydump(vma, mm_flags))
                        continue;
 
-               for (addr = vma->vm_start;
-                    addr < vma->vm_end;
-                    addr += PAGE_SIZE
-                    ) {
-                       struct vm_area_struct *vma;
-                       struct page *page;
-
-                       if (get_user_pages(current, current->mm, addr, 1, 0, 1,
-                                          &page, &vma) <= 0) {
-                               DUMP_SEEK(file->f_pos + PAGE_SIZE);
-                       }
-                       else if (page == ZERO_PAGE(0)) {
-                               page_cache_release(page);
-                               DUMP_SEEK(file->f_pos + PAGE_SIZE);
-                       }
-                       else {
-                               void *kaddr;
-
-                               flush_cache_page(vma, addr, page_to_pfn(page));
-                               kaddr = kmap(page);
-                               if ((*size += PAGE_SIZE) > *limit ||
-                                   !dump_write(file, kaddr, PAGE_SIZE)
-                                   ) {
-                                       kunmap(page);
-                                       page_cache_release(page);
-                                       return -EIO;
-                               }
+               for (addr = vma->vm_start; addr < vma->vm_end;
+                                                       addr += PAGE_SIZE) {
+                       struct page *page = get_dump_page(addr);
+                       if (page) {
+                               void *kaddr = kmap(page);
+                               *size += PAGE_SIZE;
+                               if (*size > *limit)
+                                       err = -EFBIG;
+                               else if (!dump_write(file, kaddr, PAGE_SIZE))
+                                       err = -EIO;
                                kunmap(page);
                                page_cache_release(page);
-                       }
+                       } else if (!dump_seek(file, file->f_pos + PAGE_SIZE))
+                               err = -EFBIG;
+                       if (err)
+                               goto out;
                }
        }
-
-       return 0;
-
-end_coredump:
-       return -EFBIG;
+out:
+       return err;
 }
 #endif
 
@@ -1802,7 +1783,8 @@ static int elf_fdpic_core_dump(long signr, struct pt_regs *regs,
                                goto end_coredump;
        }
 
-       DUMP_SEEK(dataoff);
+       if (!dump_seek(file, dataoff))
+               goto end_coredump;
 
        if (elf_fdpic_dump_segments(file, &size, &limit, mm_flags) < 0)
                goto end_coredump;