openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: slicoss: fix use-after-free in slic_entry_probe 

This patch fixes a use-after-free bug that can cause a kernel
oops. If slic_card_init fails then slic_entry_probe (the pci
probe() function for this device) will return error without
cleaning up memory.

Signed-off-by: David Matlack <dmatlack@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
David Matlack 2014-05-05 21:02:31 -07:00 committed by Greg Kroah-Hartman
parent 8522851e3b
commit 65bc0aaa9c
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/staging/slicoss/slicoss.c
View File

@ -3594,7 +3594,6 @@ static int slic_entry_probe(struct pci_dev *pcidev,
struct net_device *netdev; struct net_device *netdev;
struct adapter *adapter; struct adapter *adapter;
void __iomem *memmapped_ioaddr = NULL; void __iomem *memmapped_ioaddr = NULL;
u32 status = 0;
ulong mmio_start = 0; ulong mmio_start = 0;
ulong mmio_len = 0; ulong mmio_len = 0;
struct sliccard *card = NULL; struct sliccard *card = NULL;
@ -3685,16 +3684,11 @@ static int slic_entry_probe(struct pci_dev *pcidev,
adapter->allocated = 1; adapter->allocated = 1;
} }
status = slic_card_init(card, adapter); err = slic_card_init(card, adapter);
if (err)
goto err_out_unmap;
if (status != 0) { slic_adapter_set_hwaddr(adapter);
card->state = CARD_FAIL;
adapter->state = ADAPT_FAIL;
adapter->linkstate = LINK_DOWN;
dev_err(&pcidev->dev, "FAILED status[%x]\n", status);
} else {
slic_adapter_set_hwaddr(adapter);
}
netdev->base_addr = (unsigned long)adapter->memorybase; netdev->base_addr = (unsigned long)adapter->memorybase;
netdev->irq = adapter->irq; netdev->irq = adapter->irq;
@ -3711,7 +3705,7 @@ static int slic_entry_probe(struct pci_dev *pcidev,
cards_found++; cards_found++;
return status; return 0;
err_out_unmap: err_out_unmap:
iounmap(memmapped_ioaddr); iounmap(memmapped_ioaddr);