From ff853f37b7cfde9b096c9d2edf3a960bf35bf343 Mon Sep 17 00:00:00 2001 From: Bill Paul Date: Sun, 8 Feb 2004 20:39:35 +0000 Subject: [PATCH] Make NdisMMapIoSpace() guard against NULL/uninitialized resource pointers too. --- sys/compat/ndis/subr_ndis.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/compat/ndis/subr_ndis.c b/sys/compat/ndis/subr_ndis.c index ccda640381e..ec61024e47f 100644 --- a/sys/compat/ndis/subr_ndis.c +++ b/sys/compat/ndis/subr_ndis.c @@ -1464,9 +1464,11 @@ ndis_map_iospace(vaddr, adapter, paddr, len) block = (ndis_miniport_block *)adapter; sc = (struct ndis_softc *)(block->nmb_ifp); - if (paddr.np_quad == rman_get_start(sc->ndis_res_mem)) + if (sc->ndis_res_mem != NULL && + paddr.np_quad == rman_get_start(sc->ndis_res_mem)) *vaddr = (void *)rman_get_virtual(sc->ndis_res_mem); - else if (paddr.np_quad == rman_get_start(sc->ndis_res_altmem)) + else if (sc->ndis_res_altmem != NULL && + paddr.np_quad == rman_get_start(sc->ndis_res_altmem)) *vaddr = (void *)rman_get_virtual(sc->ndis_res_altmem); else return(NDIS_STATUS_FAILURE);