Commit fcd074e7 authored by Itay Iellin's avatar Itay Iellin Committed by Zheng Zengkai
Browse files

Bluetooth: Fix the creation of hdev->name 

stable inclusion
from stable-v5.10.116
commit 185fa5984d7a54bab63d37952aa5465b4fd08ac8
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I5L64K

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=185fa5984d7a54bab63d37952aa5465b4fd08ac8



--------------------------------

commit 103a2f32 upstream.

Set a size limit of 8 bytes of the written buffer to "hdev->name"
including the terminating null byte, as the size of "hdev->name" is 8
bytes. If an id value which is greater than 9999 is allocated,
then the "snprintf(hdev->name, sizeof(hdev->name), "hci%d", id)"
function call would lead to a truncation of the id value in decimal
notation.

Set an explicit maximum id parameter in the id allocation function call.
The id allocation function defines the maximum allocated id value as the
maximum id parameter value minus one. Therefore, HCI_MAX_ID is defined
as 10000.

Signed-off-by: default avatarItay Iellin <ieitayie@gmail.com>
Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
Reviewed-by: default avatarWei Li <liwei391@huawei.com>
parent 15c9973a

include/net/bluetooth/hci_core.h

+3 −0
Original line number Diff line number Diff line
@@ -35,6 +35,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
@@ -3718,10 +3718,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;
@@ -3730,7 +3730,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);