diff options
| author |   David S. Miller <davem@davemloft.net> | 2016-04-14 12:00:59 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-14 12:00:59 -0400 |
| commit | 5e265029124fc8ff9e5350972abeddc7c7a0b9cc (patch) | |
| tree | 0225f42f4d979cb32da970fed32abaffa8a8632f /net | |
| parent | bpf/verifier: reject invalid LD_ABS | BPF_DW instruction (diff) | |
| parent | nl80211: check netlink protocol in socket release notification (diff) | |
| download | linux-dev-5e265029124fc8ff9e5350972abeddc7c7a0b9cc.tar.xz linux-dev-5e265029124fc8ff9e5350972abeddc7c7a0b9cc.zip | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 98c924260b3d..056a7307862b 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(); |