aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuo-Fu Tseng <cooldavid@cooldavid.org>2010-03-16 20:09:29 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-04-01 19:01:44 -0400
commit53238f89fcbe3626d2520ae1580c5997793827f1 (patch)
tree075b219dbbe632cd6f4fed609171ddaad48925f4
parent1f80a7ae997a7e3dbe4bf8f56c2b9bc163c7e6f9 (diff)
jme: Fix VLAN memory leak
commit 17da69b8bfbe441a33a873ad5dd7d3d85800bf2b upstream. Fix memory leak while receiving 8021q tagged packet which is not registered by user. Signed-off-by: Guo-Fu Tseng <cooldavid@cooldavid.org> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/net/jme.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/jme.c b/drivers/net/jme.c
index 792b88fc3574..3da390acef8d 100644
--- a/drivers/net/jme.c
+++ b/drivers/net/jme.c
@@ -946,6 +946,8 @@ jme_alloc_and_feed_skb(struct jme_adapter *jme, int idx)
946 jme->jme_vlan_rx(skb, jme->vlgrp, 946 jme->jme_vlan_rx(skb, jme->vlgrp,
947 le16_to_cpu(rxdesc->descwb.vlan)); 947 le16_to_cpu(rxdesc->descwb.vlan));
948 NET_STAT(jme).rx_bytes += 4; 948 NET_STAT(jme).rx_bytes += 4;
949 } else {
950 dev_kfree_skb(skb);
949 } 951 }
950 } else { 952 } else {
951 jme->jme_rx(skb); 953 jme->jme_rx(skb);