From 50ca7f7f8ffc5a3cedd8165a13e035ac681d8475 Mon Sep 17 00:00:00 2001 From: Erik van der Kouwe Date: Tue, 24 Aug 2010 12:51:11 +0000 Subject: [PATCH] Zero out to three stack dwords to fix boot errors --- kernel/main.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/kernel/main.c b/kernel/main.c index 6f0df871c..b95ca5bef 100644 --- a/kernel/main.c +++ b/kernel/main.c @@ -38,6 +38,7 @@ PUBLIC int main(void) vir_clicks text_clicks, data_clicks, st_clicks; reg_t ktsb; /* kernel task stack base */ struct exec e_hdr; /* for a copy of an a.out header */ + size_t argsz; /* size of arguments passed to crtso on stack */ /* Global value to test segment sanity. */ magictest = MAGICTEST; @@ -189,7 +190,12 @@ PUBLIC int main(void) if (isusern(proc_nr)) { /* user-space process? */ rp->p_reg.sp = (rp->p_memmap[S].mem_vir + rp->p_memmap[S].mem_len) << CLICK_SHIFT; - rp->p_reg.sp -= 3 * sizeof(reg_t); + argsz = 3 * sizeof(reg_t); + rp->p_reg.sp -= argsz; + phys_memset(rp->p_reg.sp - + (rp->p_memmap[S].mem_vir << CLICK_SHIFT) + + (rp->p_memmap[S].mem_phys << CLICK_SHIFT), + 0, argsz); } /* scheduling functions depend on proc_ptr pointing somewhere. */