aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMichael Ellerman <michael@ellerman.id.au>2005-05-12 03:55:08 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-05-15 18:08:05 -0400
commit41664c03f6c96a1f8a91714309b36f1b5ca85610 (patch)
tree42805cf7bf92cf639f4c2e4dba8d1163cb11844b /drivers
parenteb235aef724568ae15af831968000cf9a3974b26 (diff)
[PATCH] iseries_veth: Don't leak skbs in RX path
Hi Andrew, Jeff, Under some strange circumstances the iseries_veth driver can leak skbs. Fix is simply to call dev_kfree_skb() in the right place. Fix up the comment as well. Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/iseries_veth.c17
1 files changed, 11 insertions, 6 deletions
diff --git a/drivers/net/iseries_veth.c b/drivers/net/iseries_veth.c
index 1e869df656c1..1edecb10993d 100644
--- a/drivers/net/iseries_veth.c
+++ b/drivers/net/iseries_veth.c
@@ -1264,13 +1264,18 @@ static void veth_receive(struct veth_lpar_connection *cnx,
1264 1264
1265 vlan = skb->data[9]; 1265 vlan = skb->data[9];
1266 dev = veth_dev[vlan]; 1266 dev = veth_dev[vlan];
1267 if (! dev) 1267 if (! dev) {
1268 /* Some earlier versions of the driver sent 1268 /*
1269 broadcasts down all connections, even to 1269 * Some earlier versions of the driver sent
1270 lpars that weren't on the relevant vlan. 1270 * broadcasts down all connections, even to lpars
1271 So ignore packets belonging to a vlan we're 1271 * that weren't on the relevant vlan. So ignore
1272 not on. */ 1272 * packets belonging to a vlan we're not on.
1273 * We can also be here if we receive packets while
1274 * the driver is going down, because then dev is NULL.
1275 */
1276 dev_kfree_skb_irq(skb);
1273 continue; 1277 continue;
1278 }
1274 1279
1275 port = (struct veth_port *)dev->priv; 1280 port = (struct veth_port *)dev->priv;
1276 dest = *((u64 *) skb->data) & 0xFFFFFFFFFFFF0000; 1281 dest = *((u64 *) skb->data) & 0xFFFFFFFFFFFF0000;