summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2016-04-14 12:00:59 -0400
committerDavid S. Miller <davem@davemloft.net>2016-04-14 12:00:59 -0400
commit5e265029124fc8ff9e5350972abeddc7c7a0b9cc (patch)
tree0225f42f4d979cb32da970fed32abaffa8a8632f /net
parentd82bccc69041a51f7b7b9b4a36db0772f4cdba21 (diff)
parent8f815cdde3e550e10c2736990d791f60c2ce43eb (diff)
downloadop-kernel-dev-5e265029124fc8ff9e5350972abeddc7c7a0b9cc.zip
op-kernel-dev-5e265029124fc8ff9e5350972abeddc7c7a0b9cc.tar.gz
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>
Diffstat (limited to 'net')
-rw-r--r--net/wireless/nl80211.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 98c9242..056a730 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -13216,7 +13216,7 @@ static int nl80211_netlink_notify(struct notifier_block * nb,
struct wireless_dev *wdev;
struct cfg80211_beacon_registration *reg, *tmp;
- if (state != NETLINK_URELEASE)
+ if (state != NETLINK_URELEASE || notify->protocol != NETLINK_GENERIC)
return NOTIFY_DONE;
rcu_read_lock();
OpenPOWER on IntegriCloud