summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorHong Liu <hong.liu@intel.com>2007-05-17 05:13:44 +0200
committerJohn W. Linville <linville@tuxdriver.com>2007-05-29 16:34:05 +0200
commite8fdeca241e17dcc5b8f2465be8e1a6347c62fb9 (patch)
tree33a1630c15f1aa1d46eff3c9792de0b8a7aacc63 /net
parent[PATCH] mac80211: fail back to use associate from reassociate (diff)
downloadlinux-e8fdeca241e17dcc5b8f2465be8e1a6347c62fb9.tar.xz
linux-e8fdeca241e17dcc5b8f2465be8e1a6347c62fb9.zip
[PATCH] mac80211: fix memory leak when defrag fragments
We forget to free all the fragments when defraging them into one packet. Signed-off-by: Hong Liu <hong.liu@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/ieee80211.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/mac80211/ieee80211.c b/net/mac80211/ieee80211.c
index 6e36df67f8d5..145604abd08e 100644
--- a/net/mac80211/ieee80211.c
+++ b/net/mac80211/ieee80211.c
@@ -3278,8 +3278,10 @@ ieee80211_rx_h_defragment(struct ieee80211_txrx_data *rx)
return TXRX_DROP;
}
}
- while ((skb = __skb_dequeue(&entry->skb_list)))
+ while ((skb = __skb_dequeue(&entry->skb_list))) {
memcpy(skb_put(rx->skb, skb->len), skb->data, skb->len);
+ dev_kfree_skb(skb);
+ }
/* Complete frame has been reassembled - process it now */
rx->fragmented = 1;