[PATCH 1/3] drivers/net/ipg.c: Fix skbuff leak
From: <hidden>
Date: 2008-01-08 13:28:10
Subsystem:
networking drivers, the rest · Maintainers:
Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
Prompted by davem, this attempt at fixing the memory leak actually appears to work. At least, leaving ping -f -s1472 -l64 running doesn't drop packets and doesn't show up in /proc/slabinfo. ---
diff --git a/drivers/net/ipg.c b/drivers/net/ipg.c
index dbd23bb..a0dfba5 100644
--- a/drivers/net/ipg.c
+++ b/drivers/net/ipg.c@@ -1110,10 +1110,9 @@ enum { Frame_WithStart_WithEnd = 11 }; -inline void ipg_nic_rx_free_skb(struct net_device *dev) +inline void ipg_nic_rx_free_skb(struct net_device *dev, unsigned entry) { struct ipg_nic_private *sp = netdev_priv(dev); - unsigned int entry = sp->rx_current % IPG_RFDLIST_LENGTH; if (sp->RxBuff[entry]) { struct ipg_rx *rxfd = sp->rxd + entry;
@@ -1308,7 +1307,7 @@ static void ipg_nic_rx_with_end(struct net_device *dev, jumbo->CurrentSize = 0; jumbo->skb = NULL; - ipg_nic_rx_free_skb(dev); + ipg_nic_rx_free_skb(dev, entry); } else { IPG_DEV_KFREE_SKB(jumbo->skb); jumbo->FoundStart = 0;
@@ -1337,7 +1336,7 @@ static void ipg_nic_rx_no_start_no_end(struct net_device *dev, } } dev->last_rx = jiffies; - ipg_nic_rx_free_skb(dev); + ipg_nic_rx_free_skb(dev, entry); } } else { IPG_DEV_KFREE_SKB(jumbo->skb);