lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dmfe: fix two bugs

Browse Source 
Fix a oops on module removal due to deallocating memory before unregistring
driver Fix a NULL pointer dereference when dev_alloc_skb fails

Signed-off-by: Maxim Levitsky <maximlevitsky@gmail.com>
Cc: Valerie Henson <val_henson@linux.intel.com>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Maxim Levitsky
2007-03-06 02:41:52 -08:00
committed by Jeff Garzik
parent f67ba792fa
commit 4dc68f3de5
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/net/tulip/dmfe.c
View File

@@ -501,14 +501,17 @@ static void __devexit dmfe_remove_one (struct pci_dev *pdev)
DMFE_DBUG(0, "dmfe_remove_one()", 0); DMFE_DBUG(0, "dmfe_remove_one()", 0);
if (dev) { if (dev) {
unregister_netdev(dev);
pci_free_consistent(db->pdev, sizeof(struct tx_desc) * pci_free_consistent(db->pdev, sizeof(struct tx_desc) *
DESC_ALL_CNT + 0x20, db->desc_pool_ptr, DESC_ALL_CNT + 0x20, db->desc_pool_ptr,
db->desc_pool_dma_ptr); db->desc_pool_dma_ptr);
pci_free_consistent(db->pdev, TX_BUF_ALLOC * TX_DESC_CNT + 4, pci_free_consistent(db->pdev, TX_BUF_ALLOC * TX_DESC_CNT + 4,
db->buf_pool_ptr, db->buf_pool_dma_ptr); db->buf_pool_ptr, db->buf_pool_dma_ptr);
unregister_netdev(dev);
pci_release_regions(pdev); pci_release_regions(pdev);
free_netdev(dev); /* free board information */ free_netdev(dev); /* free board information */
pci_set_drvdata(pdev, NULL); pci_set_drvdata(pdev, NULL);
} }
@@ -927,7 +930,7 @@ static inline u32 cal_CRC(unsigned char * Data, unsigned int Len, u8 flag)
static void dmfe_rx_packet(struct DEVICE *dev, struct dmfe_board_info * db) static void dmfe_rx_packet(struct DEVICE *dev, struct dmfe_board_info * db)
{ {
struct rx_desc *rxptr; struct rx_desc *rxptr;
struct sk_buff *skb; struct sk_buff *skb, *newskb;
int rxlen; int rxlen;
u32 rdes0; u32 rdes0;
@@ -980,9 +983,11 @@ static void dmfe_rx_packet(struct DEVICE *dev, struct dmfe_board_info * db)
} else { } else {
/* Good packet, send to upper layer */ /* Good packet, send to upper layer */
/* Shorst packet used new SKB */ /* Shorst packet used new SKB */
if ( (rxlen < RX_COPY_SIZE) && if ((rxlen < RX_COPY_SIZE) &&
( (skb = dev_alloc_skb(rxlen + 2) ) ((newskb = dev_alloc_skb(rxlen + 2))
!= NULL) ) { != NULL)) {
skb = newskb;
/* size less than COPY_SIZE, allocate a rxlen SKB */ /* size less than COPY_SIZE, allocate a rxlen SKB */
skb->dev = dev; skb->dev = dev;
skb_reserve(skb, 2); /* 16byte align */ skb_reserve(skb, 2); /* 16byte align */