Commit aa3e7eaf authored by Al Viro's avatar Al Viro
Browse files

switch elf_core_write_extra_data() to dump_emit()


Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 506f21c5
...@@ -40,8 +40,7 @@ int elf_core_write_extra_phdrs(struct coredump_params *cprm, loff_t offset) ...@@ -40,8 +40,7 @@ int elf_core_write_extra_phdrs(struct coredump_params *cprm, loff_t offset)
return 1; return 1;
} }
int elf_core_write_extra_data(struct file *file, size_t *size, int elf_core_write_extra_data(struct coredump_params *cprm)
unsigned long limit)
{ {
const struct elf_phdr *const gate_phdrs = const struct elf_phdr *const gate_phdrs =
(const struct elf_phdr *) (GATE_ADDR + GATE_EHDR->e_phoff); (const struct elf_phdr *) (GATE_ADDR + GATE_EHDR->e_phoff);
...@@ -52,8 +51,7 @@ int elf_core_write_extra_data(struct file *file, size_t *size, ...@@ -52,8 +51,7 @@ int elf_core_write_extra_data(struct file *file, size_t *size,
void *addr = (void *)gate_phdrs[i].p_vaddr; void *addr = (void *)gate_phdrs[i].p_vaddr;
size_t memsz = PAGE_ALIGN(gate_phdrs[i].p_memsz); size_t memsz = PAGE_ALIGN(gate_phdrs[i].p_memsz);
*size += memsz; if (!dump_emit(cprm, addr, memsz))
if (*size > limit || !dump_write(file, addr, memsz))
return 0; return 0;
break; break;
} }
......
...@@ -38,8 +38,7 @@ int elf_core_write_extra_phdrs(struct coredump_params *cprm, loff_t offset) ...@@ -38,8 +38,7 @@ int elf_core_write_extra_phdrs(struct coredump_params *cprm, loff_t offset)
return 1; return 1;
} }
int elf_core_write_extra_data(struct file *file, size_t *size, int elf_core_write_extra_data(struct coredump_params *cprm)
unsigned long limit)
{ {
if ( vsyscall_ehdr ) { if ( vsyscall_ehdr ) {
const struct elfhdr *const ehdrp = const struct elfhdr *const ehdrp =
...@@ -52,10 +51,7 @@ int elf_core_write_extra_data(struct file *file, size_t *size, ...@@ -52,10 +51,7 @@ int elf_core_write_extra_data(struct file *file, size_t *size,
if (phdrp[i].p_type == PT_LOAD) { if (phdrp[i].p_type == PT_LOAD) {
void *addr = (void *) phdrp[i].p_vaddr; void *addr = (void *) phdrp[i].p_vaddr;
size_t filesz = phdrp[i].p_filesz; size_t filesz = phdrp[i].p_filesz;
if (!dump_emit(cprm, addr, filesz))
*size += filesz;
if (*size > limit
|| !dump_write(file, addr, filesz))
return 0; return 0;
} }
} }
......
...@@ -2196,8 +2196,10 @@ static int elf_core_dump(struct coredump_params *cprm) ...@@ -2196,8 +2196,10 @@ static int elf_core_dump(struct coredump_params *cprm)
} }
} }
if (!elf_core_write_extra_data(cprm->file, &size, cprm->limit)) cprm->written = size;
if (!elf_core_write_extra_data(cprm))
goto end_coredump; goto end_coredump;
size = cprm->written;
if (e_phnum == PN_XNUM) { if (e_phnum == PN_XNUM) {
size += sizeof(*shdr4extnum); size += sizeof(*shdr4extnum);
......
...@@ -1818,8 +1818,10 @@ static int elf_fdpic_core_dump(struct coredump_params *cprm) ...@@ -1818,8 +1818,10 @@ static int elf_fdpic_core_dump(struct coredump_params *cprm)
cprm->mm_flags) < 0) cprm->mm_flags) < 0)
goto end_coredump; goto end_coredump;
if (!elf_core_write_extra_data(cprm->file, &size, cprm->limit)) cprm->written = size;
if (!elf_core_write_extra_data(cprm))
goto end_coredump; goto end_coredump;
size = cprm->written;
if (e_phnum == PN_XNUM) { if (e_phnum == PN_XNUM) {
size += sizeof(*shdr4extnum); size += sizeof(*shdr4extnum);
......
...@@ -67,7 +67,7 @@ extern Elf_Half elf_core_extra_phdrs(void); ...@@ -67,7 +67,7 @@ extern Elf_Half elf_core_extra_phdrs(void);
extern int extern int
elf_core_write_extra_phdrs(struct coredump_params *cprm, loff_t offset); elf_core_write_extra_phdrs(struct coredump_params *cprm, loff_t offset);
extern int extern int
elf_core_write_extra_data(struct file *file, size_t *size, unsigned long limit); elf_core_write_extra_data(struct coredump_params *cprm);
extern size_t elf_core_extra_data_size(void); extern size_t elf_core_extra_data_size(void);
#endif /* _LINUX_ELFCORE_H */ #endif /* _LINUX_ELFCORE_H */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment