Bluetooth: Fix the creation of hdev->name
Subsystems (2)
PATCH 1/1 Bluetooth: Fix the creation of hdev->name
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.
--- include/net/bluetooth/hci_core.h | 3 +++ net/bluetooth/hci_core.c | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-)
include/net/bluetooth/hci_core.h +3 -0
@@ -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
@@ -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);
Signature · 1 line
2.30.2
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=639380
---Test result---
Test Summary:
CheckPatch PASS 1.79 seconds GitLint PASS 0.98 seconds SubjectPrefix PASS 0.90 seconds BuildKernel PASS 32.10 seconds BuildKernel32 PASS 28.15 seconds Incremental Build with patchesPASS 37.92 seconds TestRunner: Setup PASS 468.75 seconds TestRunner: l2cap-tester PASS 17.43 seconds TestRunner: bnep-tester PASS 6.13 seconds TestRunner: mgmt-tester PASS 101.11 seconds TestRunner: rfcomm-tester PASS 9.61 seconds TestRunner: sco-tester PASS 9.35 seconds TestRunner: smp-tester PASS 9.46 seconds TestRunner: userchan-tester PASS 6.35 seconds
---
Regards,
Linux Bluetooth
This patch was applied to bluetooth/bluetooth-next.git (master) by Luiz Augusto von Dentz <[email protected]>:
Hello:
This patch was applied to bluetooth/bluetooth-next.git (master) by Luiz Augusto von Dentz <[email protected]>:
Quoted 8 lines · On Sat, 7 May 2022 08:32:48 -0400 you wrote:
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.[...]
Here is the summary with links:
- Bluetooth: Fix the creation of hdev->name
https://git.kernel.org/bluetooth/bluetooth-next/c/29aff7408263
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html