Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b51aff05 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

mac80211: fix mesh forwarding 



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.

Cc: stable@kernel.org [2.6.27+]
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Acked-by: default avatarJavier Cardona <javier@cozybit.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent b2b7ab22

net/mac80211/rx.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -1788,9 +1788,11 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx) 




			fwd_skb = skb_copy(skb, GFP_ATOMIC);

			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",

				printk(KERN_DEBUG "%s: failed to clone mesh frame\n",

						   sdata->name);

						   sdata->name);

				goto out;

			}





			fwd_hdr =  (struct ieee80211_hdr *) fwd_skb->data;

			fwd_hdr =  (struct ieee80211_hdr *) fwd_skb->data;

			memcpy(fwd_hdr->addr2, sdata->vif.addr, ETH_ALEN);

			memcpy(fwd_hdr->addr2, sdata->vif.addr, ETH_ALEN);
@@ -1828,6 +1830,7 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx) 
		}

		}

	}

	}





 out:

	if (is_multicast_ether_addr(hdr->addr1) ||

	if (is_multicast_ether_addr(hdr->addr1) ||

	    sdata->dev->flags & IFF_PROMISC)

	    sdata->dev->flags & IFF_PROMISC)

		return RX_CONTINUE;

		return RX_CONTINUE;