diff options
| -rw-r--r-- | sys/compat/pecoff/imgact_pecoff.c | 16 | ||||
| -rw-r--r-- | sys/kern/imgact_aout.c | 17 |
2 files changed, 31 insertions, 2 deletions
diff --git a/sys/compat/pecoff/imgact_pecoff.c b/sys/compat/pecoff/imgact_pecoff.c index 9b09632..afb12e1 100644 --- a/sys/compat/pecoff/imgact_pecoff.c +++ b/sys/compat/pecoff/imgact_pecoff.c @@ -43,6 +43,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "opt_kstack_pages.h" #include <sys/param.h> #include <sys/systm.h> @@ -173,6 +174,7 @@ pecoff_coredump(register struct thread * td, register struct vnode * vp, register struct ucred *cred = td->td_ucred; struct proc *p = td->td_proc; register struct vmspace *vm = p->p_vmspace; + caddr_t tempuser; int error; #ifdef PECOFF_DEBUG struct vm_map *map; @@ -182,6 +184,14 @@ pecoff_coredump(register struct thread * td, register struct vnode * vp, #endif if (ctob((UAREA_PAGES+KSTACK_PAGES) + vm->vm_dsize + vm->vm_ssize) >= limit) return (EFAULT); + tempuser = malloc(ctob(UAREA_PAGES + KSTACK_PAGES), M_TEMP, + M_WAITOK | M_ZERO); + if (tempuser == NULL) + return (ENOMEM); + bcopy(p->p_uarea, tempuser, sizeof(struct user)); + tempuser + ctob(UAREA_PAGES) + + ((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); @@ -195,7 +205,11 @@ pecoff_coredump(register struct thread * td, register struct vnode * vp, ent = &map->header; printf("%p %p %p\n", ent, ent->prev, ent->next); #endif - error = cpu_coredump(td, vp, cred); + 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); + free(tempuser, M_TEMP); if (error == 0) error = vn_rdwr_inchunks(UIO_WRITE, vp, vm->vm_daddr, (int)ctob(vm->vm_dsize), diff --git a/sys/kern/imgact_aout.c b/sys/kern/imgact_aout.c index b3beb9f9..eee4539 100644 --- a/sys/kern/imgact_aout.c +++ b/sys/kern/imgact_aout.c @@ -49,6 +49,7 @@ #include <sys/user.h> #include <machine/md_var.h> +#include <machine/frame.h> #include <vm/vm.h> #include <vm/vm_param.h> @@ -273,15 +274,29 @@ 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; int error; if (ctob((UAREA_PAGES + KSTACK_PAGES) + vm->vm_dsize + vm->vm_ssize) >= limit) return (EFAULT); + tempuser = malloc(ctob(UAREA_PAGES + KSTACK_PAGES), M_TEMP, + M_WAITOK | M_ZERO); + if (tempuser == NULL) + return (ENOMEM); + 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), + sizeof(struct trapframe)); PROC_LOCK(p); fill_kinfo_proc(p, &p->p_uarea->u_kproc); PROC_UNLOCK(p); - error = cpu_coredump(td, vp, cred); + 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); + free(tempuser, M_TEMP); if (error == 0) error = vn_rdwr(UIO_WRITE, vp, vm->vm_daddr, (int)ctob(vm->vm_dsize), |
