Commit a48ab883 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'for-net-2022-05-11' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth 

Luiz Augusto von Dentz says:

====================
bluetooth pull request for net:

 - Fix the creation of hdev->name when index is greater than 9999

* tag 'for-net-2022-05-11' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth:
  Bluetooth: Fix the creation of hdev->name
====================

Link: https://lore.kernel.org/r/20220512002901.823647-1-luiz.dentz@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 8bf6008c 103a2f32

include/net/bluetooth/hci_core.h

+3 −0
Original line number Diff line number Diff line
@@ -36,6 +36,9 @@ 
/* HCI priority */

#define HCI_PRIO_MAX	7



/* HCI maximum id value */

#define HCI_MAX_ID 10000



/* HCI Core structures */

struct inquiry_data {

	bdaddr_t	bdaddr;

net/bluetooth/hci_core.c

+3 −3
Original line number Diff line number Diff line
@@ -2555,10 +2555,10 @@ int hci_register_dev(struct hci_dev *hdev) 
	 */

	switch (hdev->dev_type) {

	case HCI_PRIMARY:

		id = ida_simple_get(&hci_index_ida, 0, 0, GFP_KERNEL);

		id = ida_simple_get(&hci_index_ida, 0, HCI_MAX_ID, GFP_KERNEL);

		break;

	case HCI_AMP:

		id = ida_simple_get(&hci_index_ida, 1, 0, GFP_KERNEL);

		id = ida_simple_get(&hci_index_ida, 1, HCI_MAX_ID, GFP_KERNEL);

		break;

	default:

		return -EINVAL;
@@ -2567,7 +2567,7 @@ int hci_register_dev(struct hci_dev *hdev) 
	if (id < 0)

		return id;



	sprintf(hdev->name, "hci%d", id);

	snprintf(hdev->name, sizeof(hdev->name), "hci%d", id);

	hdev->id = id;



	BT_DBG("%p name %s bus %d", hdev, hdev->name, hdev->bus);