From 999cc5fd21233eff058377a58db6839a245225f0 Mon Sep 17 00:00:00 2001 From: cinap_lenrek Date: Wed, 20 Apr 2011 11:17:33 +0000 Subject: 9boot: initialize the junk portion of pxe unload call --- sys/src/boot/pc/pxe.c | 2 +- sys/src/boot/pc/sub.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/sys/src/boot/pc/pxe.c b/sys/src/boot/pc/pxe.c index 1df2cae79..5fefd72b0 100644 --- a/sys/src/boot/pc/pxe.c +++ b/sys/src/boot/pc/pxe.c @@ -113,7 +113,7 @@ unload(void) uchar status[2]; uchar junk[10]; } buf; - puts(buf.status, 0); + memset(&buf, 0, sizeof(buf)); pxecall(0x70, &buf); } diff --git a/sys/src/boot/pc/sub.c b/sys/src/boot/pc/sub.c index 63bd5dd47..40a77fd3b 100644 --- a/sys/src/boot/pc/sub.c +++ b/sys/src/boot/pc/sub.c @@ -18,6 +18,7 @@ memmove(void *dst, void *src, int n) { uchar *d = dst; uchar *s = src; + if(d < s){ while(n > 0){ *d++ = *s++; @@ -210,6 +211,8 @@ bootkern(void *f) return "bad header"; if(beswal(ex.magic) != I_MAGIC) return "bad magic"; + + /* load address */ e = (uchar*)(beswal(ex.entry) & ~0xF0000000UL); /* @@ -219,6 +222,7 @@ bootkern(void *f) * we finished, move it to final location. */ t = (uchar*)0x200000; + n = beswal(ex.text); if(readn(f, t, n) != n) goto Error; @@ -227,7 +231,9 @@ bootkern(void *f) if(readn(f, d, n) != n) goto Error; close(f); + unload(); + n = (d + n) - t; memmove(e, t, n); jump(e); -- cgit v1.2.3