kernel: cleanup the software mouse cursor mess

[plan9front.git] / sys / src / 9 / pc / archmp.c

diff --git a/sys/src/9/pc/archmp.c b/sys/src/9/pc/archmp.c
index b331c27d62321391e023913dd26098c921251792..edf256256ddae95b913fb78d0c78e3f34f1fd6e5 100644 (file)
--- a/sys/src/9/pc/archmp.c
+++ b/sys/src/9/pc/archmp.c
@@ -383,7 +383,7 @@ identify(void)
 {
        char *cp;
        _MP_ *_mp_;
-       ulong len;
+       ulong pa, len;
 
        if((cp = getconf("*nomp")) != nil && strcmp(cp, "0") != 0)
                return 1;
@@ -395,30 +395,32 @@ identify(void)
         * if correct, check the version.
         * To do: check extended table checksum.
         */
-       if((_mp_ = sigsearch("_MP_")) == nil || checksum(_mp_, _MP_sz) != 0 || _mp_->physaddr == 0)
+       if((_mp_ = sigsearch("_MP_", _MP_sz)) == nil || _mp_->physaddr == 0)
                return 1;
 
        len = PCMPsz;
-       if(_mp_->physaddr < MemMin)
-               pcmp = KADDR(_mp_->physaddr);
-       else if((pcmp = vmap(_mp_->physaddr, len)) == nil)
+       pa = _mp_->physaddr;
+       if(pa + len-1 < pa)
                return 1;
-       if(pcmp->length < len
+
+       memreserve(pa, len);
+       if((pcmp = vmap(pa, len)) == nil)
+               return 1;
+       if(pcmp->length < PCMPsz
+       || pa + pcmp->length-1 < pa
        || memcmp(pcmp, "PCMP", 4) != 0
        || (pcmp->version != 1 && pcmp->version != 4)){
 Bad:
-               if((uintptr)pcmp < KZERO)
-                       vunmap(pcmp, len);
+               vunmap(pcmp, len);
                pcmp = nil;
                return 1;
        }
        len = pcmp->length;
-       if((uintptr)pcmp < KZERO)
-               vunmap(pcmp, PCMPsz);
-       if(_mp_->physaddr < MemMin)
-               pcmp = KADDR(_mp_->physaddr);
-       else if((pcmp = vmap(_mp_->physaddr, len)) == nil)
+       memreserve(pa, len);
+       vunmap(pcmp, PCMPsz);
+       if((pcmp = vmap(pa, len)) == nil)
                return 1;
+
        if(checksum(pcmp, len) != 0)
                goto Bad;