summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorDmitry Ivanov <dmitrijs.ivanovs@ubnt.com>2016-04-06 16:23:18 +0200
committerJohannes Berg <johannes.berg@intel.com>2016-04-12 15:39:06 +0200
commit8f815cdde3e550e10c2736990d791f60c2ce43eb (patch)
tree73a1773500eb7bb14d10b0c30001af5be98baf22 /net
parentMerge tag 'mac80211-for-davem-2016-04-06' of git://git.kernel.org/pub/scm/lin... (diff)
downloadlinux-8f815cdde3e550e10c2736990d791f60c2ce43eb.tar.xz
linux-8f815cdde3e550e10c2736990d791f60c2ce43eb.zip
nl80211: check netlink protocol in socket release notification
A non-privileged user can create a netlink socket with the same port_id as used by an existing open nl80211 netlink socket (e.g. as used by a hostapd process) with a different protocol number. Closing this socket will then lead to the notification going to nl80211's socket release notification handler, and possibly cause an action such as removing a virtual interface. Fix this issue by checking that the netlink protocol is NETLINK_GENERIC. Since generic netlink has no notifier chain of its own, we can't fix the problem more generically. Fixes: 026331c4d9b5 ("cfg80211/mac80211: allow registering for and sending action frames") Cc: stable@vger.kernel.org Signed-off-by: Dmitry Ivanov <dima@ubnt.com> [rewrite commit message] Signed-off-by: Johannes Berg <johannes.berg@intel.com>
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 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();