convert the rest of binfmt_elf_fdpic to dump_emit()
Subsystems (2)
RFC PATCH 6/13 convert the rest of binfmt_elf_fdpic to dump_emit()
Signed-off-by Al Viro <[email protected]>
--- fs/binfmt_elf_fdpic.c | 109 ++++++++++++++----------------------------------- 1 files changed, 31 insertions(+), 78 deletions(-)
fs/binfmt_elf_fdpic.c +31 -78
@@ -1267,35 +1267,23 @@ static int notesize(struct memelfnote *en)/* #define DEBUG */ -#define DUMP_WRITE (addr, nr, foffset) \ - do { if (!dump_write(file, (addr), (nr))) return 0; *foffset += (nr); } while(0) - -static int alignfile (struct file *file,loff_t *foffset) +static int alignfile (struct coredump_params *cprm) {static const char buf[4 ] = {0 , }; -DUMP_WRITE (buf,roundup (*foffset,4 ) - *foffset, foffset); -return 1 ; +return dump_emit (cprm, buf,roundup (cprm->written,4 ) - cprm->written); } -static int writenote (struct memelfnote *men,struct file *file, -loff_t *foffset) +static int writenote (struct memelfnote *men,struct coredump_params *cprm) {struct elf_note en; en.n_namesz =strlen (men->name) +1 ; en.n_descsz = men->datasz; en.n_type = men->type; -DUMP_WRITE (&en,sizeof (en), foffset); -DUMP_WRITE (men->name, en.n_namesz, foffset); -if (!alignfile (file, foffset)) -return 0 ; -DUMP_WRITE (men->data, men->datasz, foffset); -if (!alignfile (file, foffset)) -return 0 ; - -return 1 ; +return dump_emit (cprm, &en,sizeof (en)) && +dump_emit (cprm, men->name, en.n_namesz) &&alignfile (cprm) && +dump_emit (cprm, men->data, men->datasz) &&alignfile (cprm); } -#undef DUMP_WRITEstatic inline void fill_elf_fdpic_header (struct elfhdr *elf,int segs) {
@@ -1500,12 +1488,10 @@ static void fill_extnum_info(struct elfhdr *elf, struct elf_shdr *shdr4extnum,/* * dump the segments for an MMU process */ -#ifdef CONFIG_MMU -static int elf_fdpic_dump_segments (struct file *file,size_t *size, -unsigned long *limit,unsigned long mm_flags) +static bool elf_fdpic_dump_segments (struct coredump_params *cprm, +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;
@@ -1513,53 +1499,30 @@ static int elf_fdpic_dump_segments(struct file *file, size_t *size,if (!maydump (vma, mm_flags))continue ; +#ifdef CONFIG_MMU for (addr = vma->vm_start; addr < vma->vm_end; addr +=PAGE_SIZE ) { +bool res;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 ; + res =dump_emit (cprm, kaddr,PAGE_SIZE );kunmap (page);page_cache_release (page); - }else if (!dump_seek (file,PAGE_SIZE )) - err = -EFBIG ; -if (err) - goto out; + }else { + res =dump_seek (file,PAGE_SIZE ); + } +if (!res) +return false; } - } -out: -return err; -} -#endif - -/* -* dump the segments for a NOMMU process -*/ -#ifndef CONFIG_MMU -static int elf_fdpic_dump_segments (struct file *file,size_t *size, -unsigned long *limit,unsigned long mm_flags) -{ -struct vm_area_struct *vma; - -for (vma = current->mm->mmap; vma; vma = vma->vm_next) { -if (!maydump (vma, mm_flags)) -continue ; - -if ((*size +=PAGE_SIZE ) > *limit) -return -EFBIG ; - -if (!dump_write (file, (void *) vma->vm_start, +#else +if (!dump_emit (cprm, (void *) vma->vm_start, vma->vm_end - vma->vm_start)) -return -EIO ; +return false; +#endif } - -return 0 ; +return true; } -#endif static size_t elf_core_vma_data_size (unsigned long mm_flags) {
@@ -1755,13 +1718,10 @@ static int elf_fdpic_core_dump(struct coredump_params *cprm) offset = dataoff; - size +=sizeof (*elf); -if (size > cprm->limit || !dump_write (cprm->file, elf,sizeof (*elf))) +if (!dump_emit (cprm, elf,sizeof (*elf))) goto end_coredump; - size +=sizeof (*phdr4note); -if (size > cprm->limit - || !dump_write (cprm->file, phdr4note,sizeof (*phdr4note))) +if (!dump_emit (cprm, phdr4note,sizeof (*phdr4note))) goto end_coredump;/* write program headers for segments dump */
@@ -1785,20 +1745,18 @@ static int elf_fdpic_core_dump(struct coredump_params *cprm) phdr.p_flags |=PF_X ; phdr.p_align =ELF_EXEC_PAGESIZE ; - size +=sizeof (phdr); -if (size > cprm->limit - || !dump_write (cprm->file, &phdr,sizeof (phdr))) +if (!dump_emit (cprm, &phdr,sizeof (phdr))) goto end_coredump; } - cprm->written = size;if (!elf_core_write_extra_phdrs (cprm, offset)) goto end_coredump; size = cprm->written; + cprm->written = foffset;/* write out the notes section */ for (i =0 ; i < numnote; i++) -if (!writenote (notes + i, cprm->file, &foffset)) +if (!writenote (notes + i, cprm)) goto end_coredump;/* write out the thread status notes section */
@@ -1807,27 +1765,22 @@ static int elf_fdpic_core_dump(struct coredump_params *cprm) list_entry(t, struct elf_thread_status, list);for (i =0 ; i < tmp->num_notes; i++) -if (!writenote (&tmp->notes[i], cprm->file, &foffset)) +if (!writenote (&tmp->notes[i], cprm)) goto end_coredump; } -if (!dump_seek (cprm->file, dataoff - foffset)) +if (!dump_seek (cprm->file, dataoff - cprm->written)) goto end_coredump; -if (elf_fdpic_dump_segments (cprm->file, &size, &cprm->limit, - cprm->mm_flags) <0 ) + cprm->written = size; +if (!elf_fdpic_dump_segments (cprm)) goto end_coredump; - cprm->written = size;if (!elf_core_write_extra_data (cprm)) goto end_coredump; - size = cprm->written;if (e_phnum ==PN_XNUM ) { - size +=sizeof (*shdr4extnum); -if (size > cprm->limit - || !dump_write (cprm->file, shdr4extnum, -sizeof (*shdr4extnum))) +if (!dump_emit (cprm, shdr4extnum,sizeof (*shdr4extnum))) goto end_coredump; }
Signature · 1 line
1.7.2.5