commit 1ff79dfa37d36c16d91eeeebb8cc3dcba32c2c16
author Johannes Berg <johannes.berg@intel.com> Wed Jan 22 10:05:27 2014 +0100
committer Johannes Berg <johannes.berg@intel.com> Tue Feb 04 21:48:16 2014 +0100
tree 6400fb9a5f7470a37afc9fac5d8b9e07b2c23f39
parent c782bf8caae59a6cdd17ed1b99c126167dae49b2

nl80211: check channel switch validity better

Before allowing userspace to initiate a channel switch, check
that it's actually connected in some sense. Also use a more
appropriate error code for the not connected case.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

net/wireless/nl80211.c

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index a3515eb..d0f69f5 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -5771,10 +5771,15 @@
 
 		/* useless if AP is not running */
 		if (!wdev->beacon_interval)
-			return -EINVAL;
+			return -ENOTCONN;
 		break;
 	case NL80211_IFTYPE_ADHOC:
+		if (!wdev->ssid_len)
+			return -ENOTCONN;
+		break;
 	case NL80211_IFTYPE_MESH_POINT:
+		if (!wdev->mesh_id_len)
+			return -ENOTCONN;
 		break;
 	default:
 		return -EOPNOTSUPP;