nl80211: Add SOCKET_OWNER support to JOIN_MESH

Signed-off-by: Denis Kenzior <denkenz@gmail.com>
[johannes: fix race with wdev lock/unlock by just acquiring once]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

4 files changed, 11 insertions, 21 deletions

diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h
index 266b43c4f6e1..98eb37def37d 100644
--- a/include/uapi/linux/nl80211.h
+++ b/include/uapi/linux/nl80211.h
@@ -1964,6 +1964,8 @@ enum nl80211_commands {
  *      station will deauthenticate when the socket is closed.
  *      If set during %NL80211_CMD_JOIN_IBSS the IBSS will be automatically
  *      torn down when the socket is closed.
+ *      If set during %NL80211_CMD_JOIN_MESH the mesh setup will be
+ *      automatically torn down when the socket is closed.
  *
  * @NL80211_ATTR_TDLS_INITIATOR: flag attribute indicating the current end is
  *      the TDLS link initiator.
diff --git a/net/wireless/core.h b/net/wireless/core.h
index b5cf3ea8d4df..63eb1b5fdd04 100644
--- a/net/wireless/core.h
+++ b/net/wireless/core.h
@@ -303,10 +303,6 @@ int __cfg80211_join_mesh(struct cfg80211_registered_device *rdev,
                          struct net_device *dev,
                          struct mesh_setup *setup,
                          const struct mesh_config *conf);
-int cfg80211_join_mesh(struct cfg80211_registered_device *rdev,
-                       struct net_device *dev,
-                       struct mesh_setup *setup,
-                       const struct mesh_config *conf);
 int __cfg80211_leave_mesh(struct cfg80211_registered_device *rdev,
                           struct net_device *dev);
 int cfg80211_leave_mesh(struct cfg80211_registered_device *rdev,
diff --git a/net/wireless/mesh.c b/net/wireless/mesh.c
index b12da6ef3c12..eac5aa1419fc 100644
--- a/net/wireless/mesh.c
+++ b/net/wireless/mesh.c
@@ -217,21 +217,6 @@ int __cfg80211_join_mesh(struct cfg80211_registered_device *rdev,
         return err;
 }
 
-int cfg80211_join_mesh(struct cfg80211_registered_device *rdev,
-                       struct net_device *dev,
-                       struct mesh_setup *setup,
-                       const struct mesh_config *conf)
-{
-        struct wireless_dev *wdev = dev->ieee80211_ptr;
-        int err;
-
-        wdev_lock(wdev);
-        err = __cfg80211_join_mesh(rdev, dev, setup, conf);
-        wdev_unlock(wdev);
-
-        return err;
-}
-
 int cfg80211_set_mesh_channel(struct cfg80211_registered_device *rdev,
                               struct wireless_dev *wdev,
                               struct cfg80211_chan_def *chandef)
@@ -286,6 +271,7 @@ int __cfg80211_leave_mesh(struct cfg80211_registered_device *rdev,
 
         err = rdev_leave_mesh(rdev, dev);
         if (!err) {
+                wdev->conn_owner_nlportid = 0;
                 wdev->mesh_id_len = 0;
                 wdev->beacon_interval = 0;
                 memset(&wdev->chandef, 0, sizeof(wdev->chandef));
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 13f7c002f562..1d6e81e5b2c8 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -10092,7 +10092,7 @@ static int nl80211_join_mesh(struct sk_buff *skb, struct genl_info *info)
                 if (err)
                         return err;
         } else {
-                /* cfg80211_join_mesh() will sort it out */
+                /* __cfg80211_join_mesh() will sort it out */
                 setup.chandef.chan = NULL;
         }
 
@@ -10130,7 +10130,13 @@ static int nl80211_join_mesh(struct sk_buff *skb, struct genl_info *info)
         setup.userspace_handles_dfs =
                 nla_get_flag(info->attrs[NL80211_ATTR_HANDLE_DFS]);
 
-        return cfg80211_join_mesh(rdev, dev, &setup, &cfg);
+        wdev_lock(dev->ieee80211_ptr);
+        err = __cfg80211_join_mesh(rdev, dev, &setup, &cfg);
+        if (!err && info->attrs[NL80211_ATTR_SOCKET_OWNER])
+                dev->ieee80211_ptr->conn_owner_nlportid = info->snd_portid;
+        wdev_unlock(dev->ieee80211_ptr);
+
+        return err;
 }
 
 static int nl80211_leave_mesh(struct sk_buff *skb, struct genl_info *info)