AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

cciss: fix leak of ioremapped memory

Browse Source 
cciss: fix leak of ioremapped memory
in cciss_pci_init error path.

Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
This commit is contained in:
Stephen M. Cameron 2010-07-19 13:45:26 -05:00 committed by Jens Axboe
parent 4809d0988f
commit da5503217d
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/block/cciss.c
View File

@ -4114,6 +4114,10 @@ static int __devinit cciss_pci_init(ctlr_info_t *c)
if (err) if (err)
goto err_out_free_res; goto err_out_free_res;
c->vaddr = remap_pci_mem(c->paddr, 0x250); c->vaddr = remap_pci_mem(c->paddr, 0x250);
if (!c->vaddr) {
err = -ENOMEM;
goto err_out_free_res;
}
err = cciss_wait_for_board_ready(c); err = cciss_wait_for_board_ready(c);
if (err) if (err)
goto err_out_free_res; goto err_out_free_res;
@ -4198,6 +4202,12 @@ static int __devinit cciss_pci_init(ctlr_info_t *c)
* Deliberately omit pci_disable_device(): it does something nasty to * Deliberately omit pci_disable_device(): it does something nasty to
* Smart Array controllers that pci_enable_device does not undo * Smart Array controllers that pci_enable_device does not undo
*/ */
if (c->transtable)
iounmap(c->transtable);
if (c->cfgtable)
iounmap(c->cfgtable);
if (c->vaddr)
iounmap(c->vaddr);
pci_release_regions(c->pdev); pci_release_regions(c->pdev);
return err; return err;
} }
@ -4745,6 +4755,8 @@ static void __devexit cciss_remove_one(struct pci_dev *pdev)
pci_disable_msi(hba[i]->pdev); pci_disable_msi(hba[i]->pdev);
#endif /* CONFIG_PCI_MSI */ #endif /* CONFIG_PCI_MSI */
iounmap(hba[i]->transtable);
iounmap(hba[i]->cfgtable);
iounmap(hba[i]->vaddr); iounmap(hba[i]->vaddr);
pci_free_consistent(hba[i]->pdev, hba[i]->nr_cmds * sizeof(CommandList_struct), pci_free_consistent(hba[i]->pdev, hba[i]->nr_cmds * sizeof(CommandList_struct),