]>
Commit | Line | Data |
---|---|---|
6d6512bf GKH |
1 | From 17da69b8bfbe441a33a873ad5dd7d3d85800bf2b Mon Sep 17 00:00:00 2001 |
2 | From: Guo-Fu Tseng <cooldavid@cooldavid.org> | |
3 | Date: Wed, 17 Mar 2010 00:09:29 +0000 | |
4 | Subject: jme: Fix VLAN memory leak | |
5 | ||
6 | From: Guo-Fu Tseng <cooldavid@cooldavid.org> | |
7 | ||
8 | commit 17da69b8bfbe441a33a873ad5dd7d3d85800bf2b upstream. | |
9 | ||
10 | Fix memory leak while receiving 8021q tagged packet which is not | |
11 | registered by user. | |
12 | ||
13 | Signed-off-by: Guo-Fu Tseng <cooldavid@cooldavid.org> | |
14 | Signed-off-by: David S. Miller <davem@davemloft.net> | |
15 | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> | |
16 | ||
17 | --- | |
18 | drivers/net/jme.c | 2 ++ | |
19 | 1 file changed, 2 insertions(+) | |
20 | ||
21 | --- a/drivers/net/jme.c | |
22 | +++ b/drivers/net/jme.c | |
23 | @@ -946,6 +946,8 @@ jme_alloc_and_feed_skb(struct jme_adapte | |
24 | jme->jme_vlan_rx(skb, jme->vlgrp, | |
25 | le16_to_cpu(rxdesc->descwb.vlan)); | |
26 | NET_STAT(jme).rx_bytes += 4; | |
27 | + } else { | |
28 | + dev_kfree_skb(skb); | |
29 | } | |
30 | } else { | |
31 | jme->jme_rx(skb); |