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

Fix a possible memory leak in asr_attach.

Browse Source
This commit is contained in:
Scott Long 2006-02-04 06:08:19 +00:00
parent 4b2dc3c447
commit 04ab3022a9
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/dev/asr/asr.c
View File

@ -2337,12 +2337,19 @@ asr_attach(device_t dev)
sc->ha_pciDeviceNum = (pci_get_slot(dev) << 3) | pci_get_function(dev);
/* Check if the device is there? */
if ((ASR_resetIOP(sc) == 0) ||
((status = (PI2O_EXEC_STATUS_GET_REPLY)malloc(
sizeof(I2O_EXEC_STATUS_GET_REPLY), M_TEMP, M_WAITOK)) == NULL) ||
(ASR_getStatus(sc, status) == NULL)) {
if (ASR_resetIOP(sc) == 0) {
device_printf(dev, "Cannot reset adapter\n");
return (EIO);
}
if ((status = (PI2O_EXEC_STATUS_GET_REPLY)malloc(
sizeof(I2O_EXEC_STATUS_GET_REPLY), M_TEMP, M_NOWAIT)) == NULL) {
device_printf(dev, "Cannot allocate memory\n");
return (ENOMEM);
}
if (ASR_getStatus(sc, status) == NULL) {
device_printf(dev, "could not initialize hardware\n");
return(ENODEV); /* Get next, maybe better luck */
free(status, M_TEMP);
return(ENODEV);
}
sc->ha_SystemTable.OrganizationID = status->OrganizationID;
sc->ha_SystemTable.IOP_ID = status->IOP_ID;