diff options
author | Hong Liu <hong.liu@intel.com> | 2007-05-16 23:13:44 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2007-05-29 10:34:05 -0400 |
commit | e8fdeca241e17dcc5b8f2465be8e1a6347c62fb9 (patch) | |
tree | 33a1630c15f1aa1d46eff3c9792de0b8a7aacc63 /net | |
parent | f11b0f0eb2ea7562db63a01c60d398ec52d5ea46 (diff) |
[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.c | 4 |
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) | |||
3278 | return TXRX_DROP; | 3278 | return TXRX_DROP; |
3279 | } | 3279 | } |
3280 | } | 3280 | } |
3281 | while ((skb = __skb_dequeue(&entry->skb_list))) | 3281 | while ((skb = __skb_dequeue(&entry->skb_list))) { |
3282 | memcpy(skb_put(rx->skb, skb->len), skb->data, skb->len); | 3282 | memcpy(skb_put(rx->skb, skb->len), skb->data, skb->len); |
3283 | dev_kfree_skb(skb); | ||
3284 | } | ||
3283 | 3285 | ||
3284 | /* Complete frame has been reassembled - process it now */ | 3286 | /* Complete frame has been reassembled - process it now */ |
3285 | rx->fragmented = 1; | 3287 | rx->fragmented = 1; |