Skip to contentSkip to conversation

[002] dmfe : Fix possible oops

PATCH New Levitsky Maxim 1 participant 1 message Feb 7, 2007

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 [002] dmfe : Fix possible oops

From: Maxim Levitsky <[email protected]>
Subject: [PATCH] [NET] [002] dmfe : Fix possible oops

Deallocate memory after driver is unregistred to prevent oops
Don't dereference NULL pointer that can be returned by dev_alloc_skb in case of oom

---

drivers/net/tulip/dmfe.c  2007-02-07 18:27:59.000000000 +0200 renamed from drivers/net/tulip/dmfe.c   2007-02-07 18:27:07.000000000 +0200 +0 -0
@@ -497,13 +497,16 @@ static void __devexit dmfe_remove_one (s

        DMFE_DBUG(0, "dmfe_remove_one()", 0);

        if (dev) {
+
+               unregister_netdev(dev);
+               pci_release_regions(pdev);
+
+
                pci_free_consistent(db->pdev, sizeof(struct tx_desc) * DESC_ALL_CNT + 0x20, db->desc_pool_ptr, db->desc_pool_dma_ptr); pci_free_consistent(db->pdev, TX_BUF_ALLOC * TX_DESC_CNT + 4, db->buf_pool_ptr, db->buf_pool_dma_ptr); -               unregister_netdev(dev);
-               pci_release_regions(pdev);
                free_netdev(dev);       /* free board information */ pci_set_drvdata(pdev, NULL);
        }
@@ -921,7 +924,7 @@ static inline u32 cal_CRC(unsigned char
 static void dmfe_rx_packet(struct DEVICE *dev, struct dmfe_board_info * db)
 {
        struct rx_desc *rxptr;
-       struct sk_buff *skb;
+       struct sk_buff *skb, *newskb;
        int rxlen;
        u32 rdes0;

@@ -974,8 +977,10 @@ static void dmfe_rx_packet(struct DEVICE
                                        /* Good packet, send to upper layer */
                                        /* Shorst packet used new SKB */
                                        if ( (rxlen < RX_COPY_SIZE) &&
-                                               ( (skb = dev_alloc_skb(rxlen + 2) ) +                                               ( (newskb = dev_alloc_skb(rxlen + 2) ) != NULL) ) {
+
+                                               skb = newskb;
                                                /* size less than COPY_SIZE, allocate a rxlen SKB */
                                                skb->dev = dev;
                                                skb_reserve(skb, 2); /* 16byte align */

____________________________________________________________________________________
8:00? 8:25? 8:40? Find a flick in no time
with the Yahoo! Search movie showtime shortcut.
http://tools.search.yahoo.com/shortcuts/#news