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

Commit af8530cb authored Jan 04, 2018 by David S. Miller

Merge tag 'mac80211-for-davem-2018-01-04' of...

Merge tag 'mac80211-for-davem-2018-01-04' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211



Johannes Berg says:

====================
Two fixes:
 * drop mesh frames appearing to be from ourselves
 * check another netlink attribute for existence
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

parents 54e98b5d 736a80bb

net/mac80211/rx.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -3632,6 +3632,8 @@ static bool ieee80211_accept_frame(struct ieee80211_rx_data *rx)
	}		}
	return true;		return true;
	case NL80211_IFTYPE_MESH_POINT:		case NL80211_IFTYPE_MESH_POINT:
			if (ether_addr_equal(sdata->vif.addr, hdr->addr2))
			return false;
	if (multicast)		if (multicast)
	return true;		return true;
	return ether_addr_equal(sdata->vif.addr, hdr->addr1);		return ether_addr_equal(sdata->vif.addr, hdr->addr1);

net/wireless/nl80211.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -11361,7 +11361,8 @@ static int nl80211_nan_add_func(struct sk_buff *skb,
	break;		break;
	case NL80211_NAN_FUNC_FOLLOW_UP:		case NL80211_NAN_FUNC_FOLLOW_UP:
	if (!tb[NL80211_NAN_FUNC_FOLLOW_UP_ID] \|\|		if (!tb[NL80211_NAN_FUNC_FOLLOW_UP_ID] \|\|
	!tb[NL80211_NAN_FUNC_FOLLOW_UP_REQ_ID]) {		!tb[NL80211_NAN_FUNC_FOLLOW_UP_REQ_ID] \|\|
			!tb[NL80211_NAN_FUNC_FOLLOW_UP_DEST]) {
	err = -EINVAL;		err = -EINVAL;
	goto out;		goto out;
	}		}