Commit 16a910a6 authored Jul 05, 2016 by Gregory Greenman Committed by Johannes Berg Jul 06, 2016

cfg80211: handle failed skb allocation



Handle the case when dev_alloc_skb returns NULL.

Cc: stable@vger.kernel.org
Fixes: 2b67f944 ("cfg80211: reuse existing page fragments in A-MSDU rx")
Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>

parent 6e8ef842

net/wireless/util.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -721,6 +721,8 @@ __ieee80211_amsdu_copy(struct sk_buff *skb, unsigned int hlen,
		* alignment since sizeof(struct ethhdr) is 14.
		*/
		frame = dev_alloc_skb(hlen + sizeof(struct ethhdr) + 2 + cur_len);
		if (!frame)
		return NULL;

		skb_reserve(frame, hlen + sizeof(struct ethhdr) + 2);
		skb_copy_bits(skb, offset, skb_put(frame, cur_len), cur_len);