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

Commit 69687a0b authored by Luis Carlos Cobo's avatar Luis Carlos Cobo Committed by John W. Linville
Browse files

mac80211: fix access to null skb 



Without this patch, if xmit_skb is null but net_ratelimit() returns 0 we would
go to the else branch and access the null xmit_skb. Pointed out by Johannes
Berg.

Signed-off-by: default avatarLuis Carlos Cobo <luisca@cozybit.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ef269254

net/mac80211/rx.c

+3 −3
Original line number Diff line number Diff line
@@ -1305,11 +1305,11 @@ ieee80211_deliver_skb(struct ieee80211_rx_data *rx) 
		if (is_multicast_ether_addr(skb->data)) {

			if (*mesh_ttl > 0) {

				xmit_skb = skb_copy(skb, GFP_ATOMIC);

				if (!xmit_skb && net_ratelimit())

				if (xmit_skb)

					xmit_skb->pkt_type = PACKET_OTHERHOST;

				else if (net_ratelimit())

					printk(KERN_DEBUG "%s: failed to clone "

					       "multicast frame\n", dev->name);

				else

					xmit_skb->pkt_type = PACKET_OTHERHOST;

			} else

				IEEE80211_IFSTA_MESH_CTR_INC(&sdata->u.sta,

							     dropped_frames_ttl);