wifi: cfg80211: add locked debugfs wrappers

Add wrappers for debugfs files that should be called with
the wiphy mutex held, while the file is also to be removed
under the wiphy mutex. This could otherwise deadlock when
a file is trying to acquire the wiphy mutex while the code
removing it holds the mutex but waits for the removal.

This actually works by pushing the execution of the read
or write handler to a wiphy work that can be cancelled
using the debugfs cancellation API.

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

diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index b137a33a1b6892190dfa4e9067cf1045b82cf4b4..4ecfb06c413dbfd468467840dc5d1a178c6f5869 100644 (file)
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -9299,4 +9299,50 @@ bool cfg80211_valid_disable_subchannel_bitmap(u16 *bitmap,
  */
 void cfg80211_links_removed(struct net_device *dev, u16 link_mask);
 
+#ifdef CONFIG_CFG80211_DEBUGFS
+/**
+ * wiphy_locked_debugfs_read - do a locked read in debugfs
+ * @wiphy: the wiphy to use
+ * @file: the file being read
+ * @buf: the buffer to fill and then read from
+ * @bufsize: size of the buffer
+ * @userbuf: the user buffer to copy to
+ * @count: read count
+ * @ppos: read position
+ * @handler: the read handler to call (under wiphy lock)
+ * @data: additional data to pass to the read handler
+ */
+ssize_t wiphy_locked_debugfs_read(struct wiphy *wiphy, struct file *file,
+                                 char *buf, size_t bufsize,
+                                 char __user *userbuf, size_t count,
+                                 loff_t *ppos,
+                                 ssize_t (*handler)(struct wiphy *wiphy,
+                                                    struct file *file,
+                                                    char *buf,
+                                                    size_t bufsize,
+                                                    void *data),
+                                 void *data);
+
+/**
+ * wiphy_locked_debugfs_write - do a locked write in debugfs
+ * @wiphy: the wiphy to use
+ * @file: the file being written to
+ * @buf: the buffer to copy the user data to
+ * @bufsize: size of the buffer
+ * @userbuf: the user buffer to copy from
+ * @count: read count
+ * @handler: the write handler to call (under wiphy lock)
+ * @data: additional data to pass to the write handler
+ */
+ssize_t wiphy_locked_debugfs_write(struct wiphy *wiphy, struct file *file,
+                                  char *buf, size_t bufsize,
+                                  const char __user *userbuf, size_t count,
+                                  ssize_t (*handler)(struct wiphy *wiphy,
+                                                     struct file *file,
+                                                     char *buf,
+                                                     size_t count,
+                                                     void *data),
+                                  void *data);
+#endif
+
 #endif /* __NET_CFG80211_H */

diff --git a/net/wireless/debugfs.c b/net/wireless/debugfs.c
index 0878b162890af7c57073991468415a87dc9edc16..40e49074e2eeb956a8f5e1c23563e61abd8900d1 100644 (file)
--- a/net/wireless/debugfs.c
+++ b/net/wireless/debugfs.c
@@ -4,6 +4,7 @@
  *
  * Copyright 2009      Luis R. Rodriguez <lrodriguez@atheros.com>
  * Copyright 2007      Johannes Berg <johannes@sipsolutions.net>
+ * Copyright (C) 2023 Intel Corporation
  */
 
 #include <linux/slab.h>
@@ -109,3 +110,162 @@ void cfg80211_debugfs_rdev_add(struct cfg80211_registered_device *rdev)
        DEBUGFS_ADD(long_retry_limit);
        DEBUGFS_ADD(ht40allow_map);
 }
+
+struct debugfs_read_work {
+       struct wiphy_work work;
+       ssize_t (*handler)(struct wiphy *wiphy,
+                          struct file *file,
+                          char *buf,
+                          size_t count,
+                          void *data);
+       struct wiphy *wiphy;
+       struct file *file;
+       char *buf;
+       size_t bufsize;
+       void *data;
+       ssize_t ret;
+       struct completion completion;
+};
+
+static void wiphy_locked_debugfs_read_work(struct wiphy *wiphy,
+                                          struct wiphy_work *work)
+{
+       struct debugfs_read_work *w = container_of(work, typeof(*w), work);
+
+       w->ret = w->handler(w->wiphy, w->file, w->buf, w->bufsize, w->data);
+       complete(&w->completion);
+}
+
+static void wiphy_locked_debugfs_read_cancel(struct dentry *dentry,
+                                            void *data)
+{
+       struct debugfs_read_work *w = data;
+
+       wiphy_work_cancel(w->wiphy, &w->work);
+       complete(&w->completion);
+}
+
+ssize_t wiphy_locked_debugfs_read(struct wiphy *wiphy, struct file *file,
+                                 char *buf, size_t bufsize,
+                                 char __user *userbuf, size_t count,
+                                 loff_t *ppos,
+                                 ssize_t (*handler)(struct wiphy *wiphy,
+                                                    struct file *file,
+                                                    char *buf,
+                                                    size_t bufsize,
+                                                    void *data),
+                                 void *data)
+{
+       struct debugfs_read_work work = {
+               .handler = handler,
+               .wiphy = wiphy,
+               .file = file,
+               .buf = buf,
+               .bufsize = bufsize,
+               .data = data,
+               .ret = -ENODEV,
+               .completion = COMPLETION_INITIALIZER_ONSTACK(work.completion),
+       };
+       struct debugfs_cancellation cancellation = {
+               .cancel = wiphy_locked_debugfs_read_cancel,
+               .cancel_data = &work,
+       };
+
+       /* don't leak stack data or whatever */
+       memset(buf, 0, bufsize);
+
+       wiphy_work_init(&work.work, wiphy_locked_debugfs_read_work);
+       wiphy_work_queue(wiphy, &work.work);
+
+       debugfs_enter_cancellation(file, &cancellation);
+       wait_for_completion(&work.completion);
+       debugfs_leave_cancellation(file, &cancellation);
+
+       if (work.ret < 0)
+               return work.ret;
+
+       if (WARN_ON(work.ret > bufsize))
+               return -EINVAL;
+
+       return simple_read_from_buffer(userbuf, count, ppos, buf, work.ret);
+}
+EXPORT_SYMBOL_GPL(wiphy_locked_debugfs_read);
+
+struct debugfs_write_work {
+       struct wiphy_work work;
+       ssize_t (*handler)(struct wiphy *wiphy,
+                          struct file *file,
+                          char *buf,
+                          size_t count,
+                          void *data);
+       struct wiphy *wiphy;
+       struct file *file;
+       char *buf;
+       size_t count;
+       void *data;
+       ssize_t ret;
+       struct completion completion;
+};
+
+static void wiphy_locked_debugfs_write_work(struct wiphy *wiphy,
+                                           struct wiphy_work *work)
+{
+       struct debugfs_write_work *w = container_of(work, typeof(*w), work);
+
+       w->ret = w->handler(w->wiphy, w->file, w->buf, w->count, w->data);
+       complete(&w->completion);
+}
+
+static void wiphy_locked_debugfs_write_cancel(struct dentry *dentry,
+                                             void *data)
+{
+       struct debugfs_write_work *w = data;
+
+       wiphy_work_cancel(w->wiphy, &w->work);
+       complete(&w->completion);
+}
+
+ssize_t wiphy_locked_debugfs_write(struct wiphy *wiphy,
+                                  struct file *file, char *buf, size_t bufsize,
+                                  const char __user *userbuf, size_t count,
+                                  ssize_t (*handler)(struct wiphy *wiphy,
+                                                     struct file *file,
+                                                     char *buf,
+                                                     size_t count,
+                                                     void *data),
+                                  void *data)
+{
+       struct debugfs_write_work work = {
+               .handler = handler,
+               .wiphy = wiphy,
+               .file = file,
+               .buf = buf,
+               .count = count,
+               .data = data,
+               .ret = -ENODEV,
+               .completion = COMPLETION_INITIALIZER_ONSTACK(work.completion),
+       };
+       struct debugfs_cancellation cancellation = {
+               .cancel = wiphy_locked_debugfs_write_cancel,
+               .cancel_data = &work,
+       };
+
+       /* mostly used for strings so enforce NUL-termination for safety */
+       if (count >= bufsize)
+               return -EINVAL;
+
+       memset(buf, 0, bufsize);
+
+       if (copy_from_user(buf, userbuf, count))
+               return -EFAULT;
+
+       wiphy_work_init(&work.work, wiphy_locked_debugfs_write_work);
+       wiphy_work_queue(wiphy, &work.work);
+
+       debugfs_enter_cancellation(file, &cancellation);
+       wait_for_completion(&work.completion);
+       debugfs_leave_cancellation(file, &cancellation);
+
+       return work.ret;
+}
+EXPORT_SYMBOL_GPL(wiphy_locked_debugfs_write);