d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Check if the ccb_infos in the softc is NULL before trying to free it in

Browse Source 
adv_free() as the ISA probe routine doesn't malloc() ccb_infos but does
  call adv_free().
- Release the ISA-only overrun DMA tags, bufs, and maps if the probe fails.

Tested by:	rwatson
This commit is contained in:
jhb 2001-02-08 00:00:12 +00:00
parent 214a40a9dd
commit 76fd957bd1
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/dev/advansys/adv_isa.c
View File

@ -237,7 +237,7 @@ adv_isa_probe(device_t dev)
return ENXIO;
}
adv->init_level++;
adv->init_level += 2;
if (overrun_buf == NULL) {
/* Need to allocate our overrun buffer */
@ -278,6 +278,10 @@ adv_isa_probe(device_t dev)
adv->overrun_physbase = overrun_physbase;
if (adv_init(adv) != 0) {
bus_dmamap_unload(overrun_dmat, overrun_dmamap);
bus_dmamem_free(overrun_dmat, overrun_buf,
overrun_dmamap);
bus_dma_tag_destroy(overrun_dmat);
adv_free(adv);
bus_release_resource(dev, SYS_RES_IOPORT, 0, iores);
return ENXIO;
@ -317,6 +321,10 @@ adv_isa_probe(device_t dev)
if (irqres == NULL ||
bus_setup_intr(dev, irqres, INTR_TYPE_CAM, adv_intr, adv,
&ih)) {
bus_dmamap_unload(overrun_dmat, overrun_dmamap);
bus_dmamem_free(overrun_dmat, overrun_buf,
overrun_dmamap);
bus_dma_tag_destroy(overrun_dmat);
adv_free(adv);
bus_release_resource(dev, SYS_RES_IOPORT, 0, iores);
return ENXIO;

3
sys/dev/advansys/advansys.c
View File

@ -768,7 +768,8 @@ adv_free(struct adv_softc *adv)
case 2:
bus_dma_tag_destroy(adv->parent_dmat);
case 1:
free(adv->ccb_infos, M_DEVBUF);
if (adv->ccb_infos != NULL)
free(adv->ccb_infos, M_DEVBUF);
case 0:
break;
}