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

Commit 5b58d836 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mac80211-for-davem-2016-07-06' of... 

Merge tag 'mac80211-for-davem-2016-07-06' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211



Johannes Berg says:

====================
Two more fixes:
 * handle allocation failures in new(ish) A-MSDU decapsulation
 * don't leak memory on nl80211 ACL parse errors
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 92f7d07d 16a910a6

net/wireless/nl80211.c

+4 −4
Original line number Diff line number Diff line
@@ -3487,16 +3487,16 @@ static int nl80211_start_ap(struct sk_buff *skb, struct genl_info *info) 
		params.smps_mode = NL80211_SMPS_OFF;

	}



	params.pbss = nla_get_flag(info->attrs[NL80211_ATTR_PBSS]);

	if (params.pbss && !rdev->wiphy.bands[NL80211_BAND_60GHZ])

		return -EOPNOTSUPP;



	if (info->attrs[NL80211_ATTR_ACL_POLICY]) {

		params.acl = parse_acl_data(&rdev->wiphy, info);

		if (IS_ERR(params.acl))

			return PTR_ERR(params.acl);

	}



	params.pbss = nla_get_flag(info->attrs[NL80211_ATTR_PBSS]);

	if (params.pbss && !rdev->wiphy.bands[NL80211_BAND_60GHZ])

		return -EOPNOTSUPP;



	wdev_lock(wdev);

	err = rdev_start_ap(rdev, dev, &params);

	if (!err) {

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);