Skip to contentSkip to conversation

Bluetooth: Add support for setting SSP debug mode

PATCH Superseded Marcel Holtmann 2 participants 2 messages Oct 19, 2013

Subsystems (2)
lore
Share & tools
lore

Marcel Holtmann

author maintainer
#0 lore raw

PATCH v2 1/1 Bluetooth: Add support for setting SSP debug mode

Enabling and disabling SSP debug mode is useful for development. This adds a debugfs entry that allows to configure the SSP debug mode.

On purpose this has been implemented as debugfs entry and not a public API since it is really only useful during testing and development.

---
 include/net/bluetooth/hci.h      |  2 ++
 include/net/bluetooth/hci_core.h |  1 +
 net/bluetooth/hci_core.c         | 53 +++++++++++++++++++++++++++++++++++++++-
 net/bluetooth/hci_event.c        |  2 ++
 4 files changed, 57 insertions(+), 1 deletion(-)
include/net/bluetooth/hci.h +2 -0
index 77a971a..ac9c4a7 100644
@@ -1043,6 +1043,8 @@ struct hci_rp_write_remote_amp_assoc {
 	__u8     phy_handle;
 } __packed;
 
+#define HCI_OP_WRITE_SSP_DEBUG_MODE	0x1804
+
 #define HCI_OP_LE_SET_EVENT_MASK	0x2001
 struct hci_cp_le_set_event_mask {
 	__u8     mask[8];
include/net/bluetooth/hci_core.h +1 -0
index 0daac39..f621c5b 100644
@@ -169,6 +169,7 @@ struct hci_dev {
 	__u8		page_scan_type;
 	__u16		le_scan_interval;
 	__u16		le_scan_window;
+	__u8		ssp_debug_mode;
 
 	__u16		devid_source;
 	__u16		devid_vendor;
net/bluetooth/hci_core.c +52 -1

67 lines not on this page · raw message

net/bluetooth/hci_event.c +2 -0
index 8480452..83478da 100644
@@ -198,6 +198,8 @@ static void hci_cc_reset(struct hci_dev *hdev, struct sk_buff *skb)
 
 	memset(hdev->scan_rsp_data, 0, sizeof(hdev->scan_rsp_data));
 	hdev->scan_rsp_data_len = 0;
+
+	hdev->ssp_debug_mode = 0;
 }
 
 static void hci_cc_write_local_name(struct hci_dev *hdev, struct sk_buff *skb)
Signature · 1 line
1.8.3.1
#1 lore raw

Hi Marcel,

Quoted 23 lines · Marcel Holtmann
net/bluetooth/hci_core.c +23 -0
+static int ssp_debug_mode_set(void *data, u64 val)
+{
+	struct hci_dev *hdev = data;
+	struct sk_buff *skb;
+	__u8 mode;
+
+	if (val != 0 && val != 1)
+		return -EINVAL;
+
+	if (!test_bit(HCI_UP, &hdev->flags))
+		return -ENETDOWN;
+
+	hci_req_lock(hdev);
+	mode = val;
+	skb = __hci_cmd_sync(hdev, HCI_OP_WRITE_SSP_DEBUG_MODE, sizeof(mode),
+			     &mode, HCI_CMD_TIMEOUT);
+	hci_req_unlock(hdev);
+
+	if (IS_ERR(skb))
+		return PTR_ERR(skb);
+
+	if (skb->data[0]) {
+		u8 status = skb->data[0];

net/bluetooth/hci_core.c static int auto_accept_delay_get(void *data, u64 *val) · line 331

Quoted 10 lines
net/bluetooth/hci_core.c +10 -0
+		kfree_skb(skb);
+		return -bt_to_errno(status);
+	}
+
+	hci_dev_lock(hdev);
+	hdev->ssp_debug_mode = val;
+	hci_dev_unlock(hdev);
+
+	return 0;
+}

Looks like skb is being leaked here if the HCI command succeeds.

Johan