Commit 919bbad5 authored Dec 30, 2010 by Milton Miller Committed by John W. Linville Jan 04, 2011

mac80211: fix mesh forwarding when ratelimited too



Commit b51aff05 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>

parent 554d1d02

net/mac80211/rx.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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);

Admin message