summaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorMilton Miller <miltonm@bga.com>2010-12-30 02:01:03 -0600
committerJohn W. Linville <linville@tuxdriver.com>2011-01-04 14:17:23 -0500
commit919bbad580445801c22ef6ccbe624551fee652bd (patch)
treedce1f537c484cd05912eac54c9009024ff98b1cb /net/mac80211
parent554d1d027b19265c4aa3f718b3126d2b86e09a08 (diff)
downloadop-kernel-dev-919bbad580445801c22ef6ccbe624551fee652bd.zip
op-kernel-dev-919bbad580445801c22ef6ccbe624551fee652bd.tar.gz
mac80211: fix mesh forwarding when ratelimited too
Commit b51aff057c9d0ef6c529dc25fd9f775faf7b6c63 said: Under memory pressure, the mac80211 mesh code may helpfully print a message that it failed to clone a mesh frame and then will proceed to crash trying to use it anyway. Fix that. Avoid the reference whenever the frame copy is unsuccessful regardless of the debug message being suppressed or printed. Cc: stable@kernel.org [2.6.27+] Signed-off-by: Milton Miller <miltonm@bga.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/rx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index b01e467..e98668f 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -1788,11 +1788,11 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)
fwd_skb = skb_copy(skb, GFP_ATOMIC);
- if (!fwd_skb && net_ratelimit()) {
+ if (!fwd_skb && net_ratelimit())
printk(KERN_DEBUG "%s: failed to clone mesh frame\n",
sdata->name);
+ if (!fwd_skb)
goto out;
- }
fwd_hdr = (struct ieee80211_hdr *) fwd_skb->data;
memcpy(fwd_hdr->addr2, sdata->vif.addr, ETH_ALEN);
OpenPOWER on IntegriCloud