[SCSI] mpt fusion: fix two potential mem leaks
The Coverity checker spotted two potential memory leaks in drivers/message/fusion/mptbase.c::mpt_attach(). There are two returns that may leak the storage allocated for 'ioc' (sizeof(MPT_ADAPTER) bytes). A simple fix would be to simply add two kfree() calls before the return statements, but a better fix (that this patch implements) is to reorder the code so that if we hit the first return condition we don't have to do the allocation at all and then just add a kfree() call for the second case. Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com> Acked-by: "Moore, Eric Dean" <Eric.Moore@lsil.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
parent
d7383a2346
commit
568761955a
|
@ -1458,19 +1458,19 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
|
||||||
struct proc_dir_entry *dent, *ent;
|
struct proc_dir_entry *dent, *ent;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
ioc = kzalloc(sizeof(MPT_ADAPTER), GFP_ATOMIC);
|
|
||||||
if (ioc == NULL) {
|
|
||||||
printk(KERN_ERR MYNAM ": ERROR - Insufficient memory to add adapter!\n");
|
|
||||||
return -ENOMEM;
|
|
||||||
}
|
|
||||||
|
|
||||||
ioc->debug_level = mpt_debug_level;
|
|
||||||
if (mpt_debug_level)
|
if (mpt_debug_level)
|
||||||
printk(KERN_INFO MYNAM ": mpt_debug_level=%xh\n", mpt_debug_level);
|
printk(KERN_INFO MYNAM ": mpt_debug_level=%xh\n", mpt_debug_level);
|
||||||
|
|
||||||
if (pci_enable_device(pdev))
|
if (pci_enable_device(pdev))
|
||||||
return r;
|
return r;
|
||||||
|
|
||||||
|
ioc = kzalloc(sizeof(MPT_ADAPTER), GFP_ATOMIC);
|
||||||
|
if (ioc == NULL) {
|
||||||
|
printk(KERN_ERR MYNAM ": ERROR - Insufficient memory to add adapter!\n");
|
||||||
|
return -ENOMEM;
|
||||||
|
}
|
||||||
|
ioc->debug_level = mpt_debug_level;
|
||||||
|
|
||||||
dinitprintk(ioc, printk(KERN_WARNING MYNAM ": mpt_adapter_install\n"));
|
dinitprintk(ioc, printk(KERN_WARNING MYNAM ": mpt_adapter_install\n"));
|
||||||
|
|
||||||
if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK)) {
|
if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK)) {
|
||||||
|
@ -1478,6 +1478,7 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
|
||||||
": 64 BIT PCI BUS DMA ADDRESSING SUPPORTED\n"));
|
": 64 BIT PCI BUS DMA ADDRESSING SUPPORTED\n"));
|
||||||
} else if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {
|
} else if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {
|
||||||
printk(KERN_WARNING MYNAM ": 32 BIT PCI BUS DMA ADDRESSING NOT SUPPORTED\n");
|
printk(KERN_WARNING MYNAM ": 32 BIT PCI BUS DMA ADDRESSING NOT SUPPORTED\n");
|
||||||
|
kfree(ioc);
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue