Bluetooth: Move {min,max}_key_size debugfs into hci_debugfs_create_le

The debugfs entries for {min,max}_key_size are created during SMP
registration and thus it might lead to multiple attempts to create the
same entries. Avoid this by moving them to the LE controller init
section.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>

diff --git a/net/bluetooth/hci_debugfs.c b/net/bluetooth/hci_debugfs.c
index 1c8100bc4e044297478b99c7bf24da5f663b5906..6b1314c738b8e3729ac705c31900cd392550d757 100644 (file)
--- a/net/bluetooth/hci_debugfs.c
+++ b/net/bluetooth/hci_debugfs.c
@@ -26,6 +26,7 @@
 #include <net/bluetooth/bluetooth.h>
 #include <net/bluetooth/hci_core.h>
 
+#include "smp.h"
 #include "hci_debugfs.h"
 
 #define DEFINE_QUIRK_ATTRIBUTE(__name, __quirk)                                      \
@@ -989,6 +990,62 @@ static int adv_max_interval_get(void *data, u64 *val)
 DEFINE_SIMPLE_ATTRIBUTE(adv_max_interval_fops, adv_max_interval_get,
                        adv_max_interval_set, "%llu\n");
 
+static int min_key_size_set(void *data, u64 val)
+{
+       struct hci_dev *hdev = data;
+
+       if (val > hdev->le_max_key_size || val < SMP_MIN_ENC_KEY_SIZE)
+               return -EINVAL;
+
+       hci_dev_lock(hdev);
+       hdev->le_min_key_size = val;
+       hci_dev_unlock(hdev);
+
+       return 0;
+}
+
+static int min_key_size_get(void *data, u64 *val)
+{
+       struct hci_dev *hdev = data;
+
+       hci_dev_lock(hdev);
+       *val = hdev->le_min_key_size;
+       hci_dev_unlock(hdev);
+
+       return 0;
+}
+
+DEFINE_SIMPLE_ATTRIBUTE(min_key_size_fops, min_key_size_get,
+                       min_key_size_set, "%llu\n");
+
+static int max_key_size_set(void *data, u64 val)
+{
+       struct hci_dev *hdev = data;
+
+       if (val > SMP_MAX_ENC_KEY_SIZE || val < hdev->le_min_key_size)
+               return -EINVAL;
+
+       hci_dev_lock(hdev);
+       hdev->le_max_key_size = val;
+       hci_dev_unlock(hdev);
+
+       return 0;
+}
+
+static int max_key_size_get(void *data, u64 *val)
+{
+       struct hci_dev *hdev = data;
+
+       hci_dev_lock(hdev);
+       *val = hdev->le_max_key_size;
+       hci_dev_unlock(hdev);
+
+       return 0;
+}
+
+DEFINE_SIMPLE_ATTRIBUTE(max_key_size_fops, max_key_size_get,
+                       max_key_size_set, "%llu\n");
+
 static int auth_payload_timeout_set(void *data, u64 val)
 {
        struct hci_dev *hdev = data;
@@ -1071,6 +1128,10 @@ void hci_debugfs_create_le(struct hci_dev *hdev)
                            &adv_max_interval_fops);
        debugfs_create_u16("discov_interleaved_timeout", 0644, hdev->debugfs,
                           &hdev->discov_interleaved_timeout);
+       debugfs_create_file("min_key_size", 0644, hdev->debugfs, hdev,
+                           &min_key_size_fops);
+       debugfs_create_file("max_key_size", 0644, hdev->debugfs, hdev,
+                           &max_key_size_fops);
        debugfs_create_file("auth_payload_timeout", 0644, hdev->debugfs, hdev,
                            &auth_payload_timeout_fops);
 

diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index 4ece170c518ea8e8faec9df75eeaa51f8da2ece0..204f14f8b507760d35be4105fdb48fdafbf7f106 100644 (file)
--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@ -3373,94 +3373,6 @@ static const struct file_operations force_bredr_smp_fops = {
        .llseek         = default_llseek,
 };
 
-static ssize_t le_min_key_size_read(struct file *file,
-                                    char __user *user_buf,
-                                    size_t count, loff_t *ppos)
-{
-       struct hci_dev *hdev = file->private_data;
-       char buf[4];
-
-       snprintf(buf, sizeof(buf), "%2u\n", hdev->le_min_key_size);
-
-       return simple_read_from_buffer(user_buf, count, ppos, buf, strlen(buf));
-}
-
-static ssize_t le_min_key_size_write(struct file *file,
-                                     const char __user *user_buf,
-                                     size_t count, loff_t *ppos)
-{
-       struct hci_dev *hdev = file->private_data;
-       char buf[32];
-       size_t buf_size = min(count, (sizeof(buf) - 1));
-       u8 key_size;
-
-       if (copy_from_user(buf, user_buf, buf_size))
-               return -EFAULT;
-
-       buf[buf_size] = '\0';
-
-       sscanf(buf, "%hhu", &key_size);
-
-       if (key_size > hdev->le_max_key_size ||
-           key_size < SMP_MIN_ENC_KEY_SIZE)
-               return -EINVAL;
-
-       hdev->le_min_key_size = key_size;
-
-       return count;
-}
-
-static const struct file_operations le_min_key_size_fops = {
-       .open           = simple_open,
-       .read           = le_min_key_size_read,
-       .write          = le_min_key_size_write,
-       .llseek         = default_llseek,
-};
-
-static ssize_t le_max_key_size_read(struct file *file,
-                                    char __user *user_buf,
-                                    size_t count, loff_t *ppos)
-{
-       struct hci_dev *hdev = file->private_data;
-       char buf[4];
-
-       snprintf(buf, sizeof(buf), "%2u\n", hdev->le_max_key_size);
-
-       return simple_read_from_buffer(user_buf, count, ppos, buf, strlen(buf));
-}
-
-static ssize_t le_max_key_size_write(struct file *file,
-                                     const char __user *user_buf,
-                                     size_t count, loff_t *ppos)
-{
-       struct hci_dev *hdev = file->private_data;
-       char buf[32];
-       size_t buf_size = min(count, (sizeof(buf) - 1));
-       u8 key_size;
-
-       if (copy_from_user(buf, user_buf, buf_size))
-               return -EFAULT;
-
-       buf[buf_size] = '\0';
-
-       sscanf(buf, "%hhu", &key_size);
-
-       if (key_size > SMP_MAX_ENC_KEY_SIZE ||
-           key_size < hdev->le_min_key_size)
-               return -EINVAL;
-
-       hdev->le_max_key_size = key_size;
-
-       return count;
-}
-
-static const struct file_operations le_max_key_size_fops = {
-       .open           = simple_open,
-       .read           = le_max_key_size_read,
-       .write          = le_max_key_size_write,
-       .llseek         = default_llseek,
-};
-
 int smp_register(struct hci_dev *hdev)
 {
        struct l2cap_chan *chan;
@@ -3485,11 +3397,6 @@ int smp_register(struct hci_dev *hdev)
 
        hdev->smp_data = chan;
 
-       debugfs_create_file("le_min_key_size", 0644, hdev->debugfs, hdev,
-                           &le_min_key_size_fops);
-       debugfs_create_file("le_max_key_size", 0644, hdev->debugfs, hdev,
-                           &le_max_key_size_fops);
-
        /* If the controller does not support BR/EDR Secure Connections
         * feature, then the BR/EDR SMP channel shall not be present.
         *