From 21b23e4fe817edef196743750867fa0f6120c902 Mon Sep 17 00:00:00 2001 From: peter Date: Sat, 7 Sep 2002 22:31:44 +0000 Subject: Tidy up some loose ends that bde pointed out. caddr_t bad, ok? Move fill_kinfo_proc to before we copy the results instead of after the copy and too late. There is still more to do here. --- sys/kern/imgact_aout.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'sys/kern/imgact_aout.c') diff --git a/sys/kern/imgact_aout.c b/sys/kern/imgact_aout.c index e21358a..4ed589d 100644 --- a/sys/kern/imgact_aout.c +++ b/sys/kern/imgact_aout.c @@ -272,7 +272,7 @@ aout_coredump(td, vp, limit) struct proc *p = td->td_proc; register struct ucred *cred = td->td_ucred; register struct vmspace *vm = p->p_vmspace; - caddr_t tempuser; + char *tempuser; int error; if (ctob((uarea_pages + kstack_pages) @@ -282,15 +282,15 @@ aout_coredump(td, vp, limit) M_WAITOK | M_ZERO); if (tempuser == NULL) return (ENOMEM); + PROC_LOCK(p); + fill_kinfo_proc(p, &p->p_uarea->u_kproc); + PROC_UNLOCK(p); bcopy(p->p_uarea, tempuser, sizeof(struct user)); bcopy(td->td_frame, tempuser + ctob(uarea_pages) + - ((caddr_t) td->td_frame - (caddr_t) td->td_kstack), + ((caddr_t)td->td_frame - (caddr_t)td->td_kstack), sizeof(struct trapframe)); - PROC_LOCK(p); - fill_kinfo_proc(p, &p->p_uarea->u_kproc); - PROC_UNLOCK(p); - error = vn_rdwr(UIO_WRITE, vp, (caddr_t) tempuser, + error = vn_rdwr(UIO_WRITE, vp, (caddr_t)tempuser, ctob(uarea_pages + kstack_pages), (off_t)0, UIO_SYSSPACE, IO_UNIT, cred, NOCRED, (int *)NULL, td); @@ -302,7 +302,7 @@ aout_coredump(td, vp, limit) IO_UNIT | IO_DIRECT, cred, NOCRED, (int *) NULL, td); if (error == 0) error = vn_rdwr_inchunks(UIO_WRITE, vp, - (caddr_t) trunc_page(USRSTACK - ctob(vm->vm_ssize)), + (caddr_t)trunc_page(USRSTACK - ctob(vm->vm_ssize)), round_page(ctob(vm->vm_ssize)), (off_t)ctob(uarea_pages + kstack_pages) + ctob(vm->vm_dsize), UIO_USERSPACE, -- cgit v1.1