Bluetooth: eir: Fix possible crashes on eir_create_adv_data
Subsystems (2)
Luiz Augusto von Dentz
maintainerPATCH 1/1 Bluetooth: eir: Fix possible crashes on eir_create_adv_data
From: Luiz Augusto von Dentz <[email protected]>
eir_create_adv_data may attempt to add EIR_FLAGS and EIR_TX_POWER without checking if that would fit.
--- net/bluetooth/eir.c | 7 ++++--- net/bluetooth/eir.h | 2 +- net/bluetooth/hci_sync.c | 5 +++-- 3 files changed, 8 insertions(+), 6 deletions(-)
net/bluetooth/eir.c +4 -3
@@ -242,7 +242,7 @@ u8 eir_create_per_adv_data(struct hci_dev *hdev, u8 instance, u8 *ptr)return ad_len; } -u8 eir_create_adv_data (struct hci_dev *hdev,u8 instance,u8 *ptr) +u8 eir_create_adv_data (struct hci_dev *hdev,u8 instance,u8 *ptr,u8 size) {struct adv_info *adv =NULL ;u8 ad_len =0 , flags =0 ;
@@ -286,7 +286,7 @@ u8 eir_create_adv_data(struct hci_dev *hdev, u8 instance, u8 *ptr)/* If flags would still be empty, then there is no need to * include the "Flags" AD field". */ -if (flags) { +if (flags && (ad_len +eir_precalc_len (1 ) <= size)) { ptr[0 ] =0x02 ; ptr[1 ] =EIR_FLAGS ; ptr[2 ] = flags;
@@ -316,7 +316,8 @@ u8 eir_create_adv_data(struct hci_dev *hdev, u8 instance, u8 *ptr) }/* Provide Tx Power only if we can provide a valid value for it */ -if (adv_tx_power !=HCI_TX_POWER_INVALID ) { +if (adv_tx_power !=HCI_TX_POWER_INVALID && + (ad_len +eir_precalc_len (1 ) <= size)) { ptr[0 ] =0x02 ; ptr[1 ] =EIR_TX_POWER ; ptr[2 ] = (u8 )adv_tx_power;
net/bluetooth/eir.h +1 -1
@@ -9,7 +9,7 @@void eir_create (struct hci_dev *hdev,u8 *data); -u8 eir_create_adv_data (struct hci_dev *hdev,u8 instance,u8 *ptr); +u8 eir_create_adv_data (struct hci_dev *hdev,u8 instance,u8 *ptr,u8 size);u8 eir_create_scan_rsp (struct hci_dev *hdev,u8 instance,u8 *ptr);u8 eir_create_per_adv_data (struct hci_dev *hdev,u8 instance,u8 *ptr);
net/bluetooth/hci_sync.c +3 -2
@@ -1836,7 +1836,8 @@ static int hci_set_ext_adv_data_sync(struct hci_dev *hdev, u8 instance)return 0 ; } - len =eir_create_adv_data (hdev, instance, pdu->data); + len =eir_create_adv_data (hdev, instance, pdu->data, +HCI_MAX_EXT_AD_LENGTH ); pdu->length = len; pdu->handle = adv ? adv->handle : instance;
@@ -1867,7 +1868,7 @@ static int hci_set_adv_data_sync(struct hci_dev *hdev, u8 instance)memset (&cp,0 ,sizeof (cp)); - len =eir_create_adv_data (hdev, instance, cp.data); + len =eir_create_adv_data (hdev, instance, cp.data,sizeof (cp.data));/* There's nothing to do if the data hasn't changed */ if (hdev->adv_data_len == len &&
Signature · 1 line
2.49.0
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=970393
---Test result---
Test Summary:
CheckPatch PENDING 0.32 seconds GitLint PENDING 0.25 seconds SubjectPrefix PASS 0.09 seconds BuildKernel PASS 24.59 seconds CheckAllWarning PASS 26.71 seconds CheckSparse PASS 30.09 seconds BuildKernel32 PASS 24.06 seconds TestRunnerSetup PASS 456.45 seconds TestRunner_l2cap-tester PASS 25.36 seconds TestRunner_iso-tester PASS 40.17 seconds TestRunner_bnep-tester PASS 6.05 seconds TestRunner_mgmt-tester FAIL 133.50 seconds TestRunner_rfcomm-tester PASS 9.68 seconds TestRunner_sco-tester PASS 14.92 seconds TestRunner_ioctl-tester PASS 10.02 seconds TestRunner_mesh-tester PASS 7.38 seconds TestRunner_smp-tester PASS 8.65 seconds TestRunner_userchan-tester PASS 6.24 seconds IncrementalBuild PENDING 0.76 seconds
Details
##############################
Test: CheckPatch - PENDING
Desc: Run checkpatch.pl script Output:
##############################
Test: GitLint - PENDING
Desc: Run gitlint
Output:
##############################
Test: TestRunner_mgmt-tester - FAIL
Desc: Run mgmt-tester with test-runner Output:
Total: 490, Passed: 485 (99.0%), Failed: 1, Not Run: 4
Failed Test Cases
LL Privacy - Add Device 3 (AL is full) Failed 0.211 seconds
##############################
Test: IncrementalBuild - PENDING
Desc: Incremental build with the patches in the series Output:
---
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 10 lines · On Tue, 10 Jun 2025 10:28:33 -0400 you wrote:
From: Luiz Augusto von Dentz <[email protected]>
eir_create_adv_datamay attempt to addEIR_FLAGSandEIR_TX_POWERwithout checking if that would fit.Fixes 01ce70b0a274 ("Bluetooth: eir: Move EIR/Adv Data functions to its own file")Signed-off-by Luiz Augusto von Dentz <[email protected]>[...]
Here is the summary with links:
- [v1] Bluetooth: eir: Fix possible crashes on eir_create_adv_data
https://git.kernel.org/bluetooth/bluetooth-next/c/2814f02508c4
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html