diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2010-12-22 10:15:07 +0100 |
|---|---|---|
| committer | AK <andi@firstfloor.org> | 2011-02-06 11:03:51 -0800 |
| commit | 9c7d253b2ba4a6621b19e439cdb1441e802374e5 (patch) | |
| tree | 0e6078f51b2580c5cc50aa4d190db59103847229 | |
| parent | e460ad502aa1e940b4069734d8d96cc4a303062e (diff) | |
mac80211: fix mesh forwarding
commit b51aff057c9d0ef6c529dc25fd9f775faf7b6c63 upstream.
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.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Acked-by: Javier Cardona <javier@cozybit.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
| -rw-r--r-- | net/mac80211/rx.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index af775e9bf60a..3a39074df1d7 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -1707,9 +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); + goto out; + } fwd_hdr = (struct ieee80211_hdr *) fwd_skb->data; memcpy(fwd_hdr->addr2, sdata->vif.addr, ETH_ALEN); @@ -1747,6 +1749,7 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx) } } + out: if (is_multicast_ether_addr(hdr->addr1) || sdata->dev->flags & IFF_PROMISC) return RX_CONTINUE; |