Commit b7bc9679 authored by Ben Greear's avatar Ben Greear Committed by Johannes Berg
Browse files

mac80211_hwsim: fix memory leak on netlink TX failure



If the packet can't be delivered to userspace (at all or
quickly enough) then it can leak - fix that.
Signed-off-by: default avatarBen Greear <greearb@candelatech.com>
[rewrite commit message]
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 35a9ad8a
...@@ -862,7 +862,7 @@ static void mac80211_hwsim_tx_frame_nl(struct ieee80211_hw *hw, ...@@ -862,7 +862,7 @@ static void mac80211_hwsim_tx_frame_nl(struct ieee80211_hw *hw,
if (skb_queue_len(&data->pending) >= MAX_QUEUE) { if (skb_queue_len(&data->pending) >= MAX_QUEUE) {
/* Droping until WARN_QUEUE level */ /* Droping until WARN_QUEUE level */
while (skb_queue_len(&data->pending) >= WARN_QUEUE) while (skb_queue_len(&data->pending) >= WARN_QUEUE)
skb_dequeue(&data->pending); ieee80211_free_txskb(hw, skb_dequeue(&data->pending));
} }
skb = genlmsg_new(GENLMSG_DEFAULT_SIZE, GFP_ATOMIC); skb = genlmsg_new(GENLMSG_DEFAULT_SIZE, GFP_ATOMIC);
...@@ -921,6 +921,7 @@ static void mac80211_hwsim_tx_frame_nl(struct ieee80211_hw *hw, ...@@ -921,6 +921,7 @@ static void mac80211_hwsim_tx_frame_nl(struct ieee80211_hw *hw,
nla_put_failure: nla_put_failure:
printk(KERN_DEBUG "mac80211_hwsim: error occurred in %s\n", __func__); printk(KERN_DEBUG "mac80211_hwsim: error occurred in %s\n", __func__);
ieee80211_free_txskb(hw, my_skb);
} }
static bool hwsim_chans_compat(struct ieee80211_channel *c1, static bool hwsim_chans_compat(struct ieee80211_channel *c1,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment