Commit 5e265029 authored Apr 14, 2016 by David S. Miller

Merge tag 'mac80211-for-davem-2016-04-14' of...

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



Johannes Berg says:

====================
This has just the single fix from Dmitry Ivanov, adding the missing
netlink notifier family check to avoid the socket close DoS problem.
====================

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

parents d82bccc6 8f815cdd

net/wireless/nl80211.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -13216,7 +13216,7 @@ static int nl80211_netlink_notify(struct notifier_block * nb,
	struct wireless_dev *wdev;		struct wireless_dev *wdev;
	struct cfg80211_beacon_registration reg, tmp;		struct cfg80211_beacon_registration reg, tmp;

	if (state != NETLINK_URELEASE)		if (state != NETLINK_URELEASE \|\| notify->protocol != NETLINK_GENERIC)
	return NOTIFY_DONE;		return NOTIFY_DONE;

	rcu_read_lock();		rcu_read_lock();