aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2013-10-07 07:22:01 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2013-11-09 00:16:25 -0500
commit43a5d548eb5949580c1d96b9f3fa9f4c0bee0b98 (patch)
treec93a2339c6067096d419feac2260e89baf8d4f3c /arch
parentcdc3d5627d5f7c4e6b6372b9fb39cba0fe6a9b2a (diff)
aout: switch to dump_emit
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/ia32/ia32_aout.c20
1 files changed, 8 insertions, 12 deletions
diff --git a/arch/x86/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c
index 80361c00fb64..9e26e9e85576 100644
--- a/arch/x86/ia32/ia32_aout.c
+++ b/arch/x86/ia32/ia32_aout.c
@@ -133,14 +133,6 @@ static void set_brk(unsigned long start, unsigned long end)
133 133
134#include <linux/coredump.h> 134#include <linux/coredump.h>
135 135
136#define DUMP_WRITE(addr, nr) \
137 if (!dump_write(cprm->file, (void *)(addr), (nr))) \
138 goto end_coredump;
139
140#define DUMP_SEEK(offset) \
141 if (!dump_seek(cprm->file, offset)) \
142 goto end_coredump;
143
144#define START_DATA(u) (u.u_tsize << PAGE_SHIFT) 136#define START_DATA(u) (u.u_tsize << PAGE_SHIFT)
145#define START_STACK(u) (u.start_stack) 137#define START_STACK(u) (u.start_stack)
146 138
@@ -192,22 +184,26 @@ static int aout_core_dump(struct coredump_params *cprm)
192 184
193 set_fs(KERNEL_DS); 185 set_fs(KERNEL_DS);
194 /* struct user */ 186 /* struct user */
195 DUMP_WRITE(&dump, sizeof(dump)); 187 if (!dump_emit(cprm, &dump, sizeof(dump)))
188 goto end_coredump;
196 /* Now dump all of the user data. Include malloced stuff as well */ 189 /* Now dump all of the user data. Include malloced stuff as well */
197 DUMP_SEEK(PAGE_SIZE - sizeof(dump)); 190 if (!dump_seek(cprm->file, PAGE_SIZE - sizeof(dump)))
191 goto end_coredump;
198 /* now we start writing out the user space info */ 192 /* now we start writing out the user space info */
199 set_fs(USER_DS); 193 set_fs(USER_DS);
200 /* Dump the data area */ 194 /* Dump the data area */
201 if (dump.u_dsize != 0) { 195 if (dump.u_dsize != 0) {
202 dump_start = START_DATA(dump); 196 dump_start = START_DATA(dump);
203 dump_size = dump.u_dsize << PAGE_SHIFT; 197 dump_size = dump.u_dsize << PAGE_SHIFT;
204 DUMP_WRITE(dump_start, dump_size); 198 if (!dump_emit(cprm, (void *)dump_start, dump_size))
199 goto end_coredump;
205 } 200 }
206 /* Now prepare to dump the stack area */ 201 /* Now prepare to dump the stack area */
207 if (dump.u_ssize != 0) { 202 if (dump.u_ssize != 0) {
208 dump_start = START_STACK(dump); 203 dump_start = START_STACK(dump);
209 dump_size = dump.u_ssize << PAGE_SHIFT; 204 dump_size = dump.u_ssize << PAGE_SHIFT;
210 DUMP_WRITE(dump_start, dump_size); 205 if (!dump_emit(cprm, (void *)dump_start, dump_size))
206 goto end_coredump;
211 } 207 }
212end_coredump: 208end_coredump:
213 set_fs(fs); 209 set_fs(fs);