]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
jme: Fix VLAN memory leak
authorGuo-Fu Tseng <cooldavid@cooldavid.org>
Wed, 17 Mar 2010 00:09:29 +0000 (00:09 +0000)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 1 Apr 2010 22:58:39 +0000 (15:58 -0700)
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>
drivers/net/jme.c

index 1d2a32544ed2d50189d53c7197f976834a5983e3..577cae69f1cfccd2678d8a53dc5f9c7097172206 100644 (file)
@@ -946,6 +946,8 @@ jme_alloc_and_feed_skb(struct jme_adapter *jme, int idx)
                                jme->jme_vlan_rx(skb, jme->vlgrp,
                                        le16_to_cpu(rxdesc->descwb.vlan));
                                NET_STAT(jme).rx_bytes += 4;
+                       } else {
+                               dev_kfree_skb(skb);
                        }
                } else {
                        jme->jme_rx(skb);