Commit 82493316 authored by Claire Chang's avatar Claire Chang Committed by Marcel Holtmann
Browse files

Bluetooth: Move force_bredr_smp debugfs into hci_debugfs_create_bredr 



Avoid multiple attempts to create the debugfs entry, force_bredr_smp,
by moving it from the SMP registration to the BR/EDR controller init
section. hci_debugfs_create_bredr is only called when HCI_SETUP and
HCI_CONFIG is not set.

Signed-off-by: default avatarClaire Chang <tientzu@chromium.org>
Reviewed-by: default avatarAlain Michaud <alainm@chromium.org>
Reviewed-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 1fb17dfc

net/bluetooth/hci_debugfs.c

+50 −0
Original line number Diff line number Diff line
@@ -494,6 +494,45 @@ static int auto_accept_delay_get(void *data, u64 *val) 
DEFINE_SIMPLE_ATTRIBUTE(auto_accept_delay_fops, auto_accept_delay_get,

			auto_accept_delay_set, "%llu\n");



static ssize_t force_bredr_smp_read(struct file *file,

				    char __user *user_buf,

				    size_t count, loff_t *ppos)

{

	struct hci_dev *hdev = file->private_data;

	char buf[3];



	buf[0] = hci_dev_test_flag(hdev, HCI_FORCE_BREDR_SMP) ? 'Y' : 'N';

	buf[1] = '\n';

	buf[2] = '\0';

	return simple_read_from_buffer(user_buf, count, ppos, buf, 2);

}



static ssize_t force_bredr_smp_write(struct file *file,

				     const char __user *user_buf,

				     size_t count, loff_t *ppos)

{

	struct hci_dev *hdev = file->private_data;

	bool enable;

	int err;



	err = kstrtobool_from_user(user_buf, count, &enable);

	if (err)

		return err;



	err = smp_force_bredr(hdev, enable);

	if (err)

		return err;



	return count;

}



static const struct file_operations force_bredr_smp_fops = {

	.open		= simple_open,

	.read		= force_bredr_smp_read,

	.write		= force_bredr_smp_write,

	.llseek		= default_llseek,

};



static int idle_timeout_set(void *data, u64 val)

{

	struct hci_dev *hdev = data;
@@ -589,6 +628,17 @@ void hci_debugfs_create_bredr(struct hci_dev *hdev) 
	debugfs_create_file("voice_setting", 0444, hdev->debugfs, hdev,

			    &voice_setting_fops);



	/* If the controller does not support BR/EDR Secure Connections

	 * feature, then the BR/EDR SMP channel shall not be present.

	 *

	 * To test this with Bluetooth 4.0 controllers, create a debugfs

	 * switch that allows forcing BR/EDR SMP support and accepting

	 * cross-transport pairing on non-AES encrypted connections.

	 */

	if (!lmp_sc_capable(hdev))

		debugfs_create_file("force_bredr_smp", 0644, hdev->debugfs,

				    hdev, &force_bredr_smp_fops);



	if (lmp_ssp_capable(hdev)) {

		debugfs_create_file("ssp_debug_mode", 0444, hdev->debugfs,

				    hdev, &ssp_debug_mode_fops);

net/bluetooth/smp.c

+2 −42
Original line number Diff line number Diff line
@@ -3353,31 +3353,8 @@ static void smp_del_chan(struct l2cap_chan *chan) 
	l2cap_chan_put(chan);

}



static ssize_t force_bredr_smp_read(struct file *file,

				    char __user *user_buf,

				    size_t count, loff_t *ppos)

{

	struct hci_dev *hdev = file->private_data;

	char buf[3];



	buf[0] = hci_dev_test_flag(hdev, HCI_FORCE_BREDR_SMP) ? 'Y': 'N';

	buf[1] = '\n';

	buf[2] = '\0';

	return simple_read_from_buffer(user_buf, count, ppos, buf, 2);

}



static ssize_t force_bredr_smp_write(struct file *file,

				     const char __user *user_buf,

				     size_t count, loff_t *ppos)

int smp_force_bredr(struct hci_dev *hdev, bool enable)

{

	struct hci_dev *hdev = file->private_data;

	bool enable;

	int err;



	err = kstrtobool_from_user(user_buf, count, &enable);

	if (err)

		return err;



	if (enable == hci_dev_test_flag(hdev, HCI_FORCE_BREDR_SMP))

		return -EALREADY;
@@ -3399,16 +3376,9 @@ static ssize_t force_bredr_smp_write(struct file *file, 


	hci_dev_change_flag(hdev, HCI_FORCE_BREDR_SMP);



	return count;

	return 0;

}



static const struct file_operations force_bredr_smp_fops = {

	.open		= simple_open,

	.read		= force_bredr_smp_read,

	.write		= force_bredr_smp_write,

	.llseek		= default_llseek,

};



int smp_register(struct hci_dev *hdev)

{

	struct l2cap_chan *chan;
@@ -3433,17 +3403,7 @@ int smp_register(struct hci_dev *hdev) 


	hdev->smp_data = chan;



	/* If the controller does not support BR/EDR Secure Connections

	 * feature, then the BR/EDR SMP channel shall not be present.

	 *

	 * To test this with Bluetooth 4.0 controllers, create a debugfs

	 * switch that allows forcing BR/EDR SMP support and accepting

	 * cross-transport pairing on non-AES encrypted connections.

	 */

	if (!lmp_sc_capable(hdev)) {

		debugfs_create_file("force_bredr_smp", 0644, hdev->debugfs,

				    hdev, &force_bredr_smp_fops);



		/* Flag can be already set here (due to power toggle) */

		if (!hci_dev_test_flag(hdev, HCI_FORCE_BREDR_SMP))

			return 0;

net/bluetooth/smp.h

+2 −0
Original line number Diff line number Diff line
@@ -193,6 +193,8 @@ bool smp_irk_matches(struct hci_dev *hdev, const u8 irk[16], 
int smp_generate_rpa(struct hci_dev *hdev, const u8 irk[16], bdaddr_t *rpa);

int smp_generate_oob(struct hci_dev *hdev, u8 hash[16], u8 rand[16]);



int smp_force_bredr(struct hci_dev *hdev, bool enable);



int smp_register(struct hci_dev *hdev);

void smp_unregister(struct hci_dev *hdev);