diff options
| author | Milton Miller <miltonm@bga.com> | 2010-12-30 02:01:03 -0600 |
|---|---|---|
| committer | AK <andi@firstfloor.org> | 2011-02-06 11:04:07 -0800 |
| commit | f973dacde9f9eddd6ead17532d1a5b6e45a0fc72 (patch) | |
| tree | 105a00de2991e32b61de7a1a3d46a7ac2df3e6fd /net | |
| parent | be9627d438a0bbad74b10fa58cc87b9869de33e6 (diff) | |
| download | linux-stable-f973dacde9f9eddd6ead17532d1a5b6e45a0fc72.tar.gz linux-stable-f973dacde9f9eddd6ead17532d1a5b6e45a0fc72.tar.bz2 linux-stable-f973dacde9f9eddd6ead17532d1a5b6e45a0fc72.zip | |
mac80211: fix mesh forwarding when ratelimited too
[ upstream commit 919bbad580445801c22ef6ccbe624551fee652bd ]
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>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/rx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 3a39074df1d7..dc7e773c8496 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -1707,11 +1707,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); |