bluetooth 2025-04-10
Subsystems (2)
Luiz Augusto von Dentz
maintainerThe following changes since commit eaa517b77e63442260640d875f824d1111ca6569:
ethtool: cmis_cdb: Fix incorrect read / write length extension (2025-04-10 14:32:43 +0200)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth.git tags/for-net-2025-04-10
for you to fetch changes up to 522e9ed157e3c21b4dd623c79967f72c21e45b78:
Bluetooth: l2cap: Check encryption key size on incoming connection (2025-04-10 13:09:42 -0400)
----------------------------------------------------------------
bluetooth pull request for net:
- btrtl: Prevent potential NULL dereference
- qca: fix NV variant for one of WCN3950 SoCs
- l2cap: Check encryption key size on incoming connection
- hci_event: Fix sending MGMT_EV_DEVICE_FOUND for invalid address
- btnxpuart: Revert baudrate change in nxp_shutdown
- btnxpuart: Add an error message if FW dump trigger fails
- increment TX timestamping tskey always for stream sockets
----------------------------------------------------------------
Dan Carpenter (1):
Bluetooth: btrtl: Prevent potential NULL dereference
Dmitry Baryshkov (1):
Bluetooth: qca: fix NV variant for one of WCN3950 SoCs
Frédéric Danis (1):
Bluetooth: l2cap: Check encryption key size on incoming connection
Luiz Augusto von Dentz (1):
Bluetooth: hci_event: Fix sending MGMT_EV_DEVICE_FOUND for invalid address
Neeraj Sanjay Kale (2):
Bluetooth: btnxpuart: Revert baudrate change in nxp_shutdown
Bluetooth: btnxpuart: Add an error message if FW dump trigger fails
Pauli Virtanen (1):
Bluetooth: increment TX timestamping tskey always for stream sockets
drivers/bluetooth/btnxpuart.c | 21 +++++++++++---------- drivers/bluetooth/btqca.c | 2 +- drivers/bluetooth/btrtl.c | 2 ++ net/bluetooth/hci_conn.c | 8 ++++++-- net/bluetooth/hci_event.c | 5 +++-- net/bluetooth/l2cap_core.c | 3 ++- 6 files changed, 25 insertions(+), 16 deletions(-)
Luiz Augusto von Dentz
maintainerPATCH v3 1/2 Bluetooth: hci_conn: Fix not setting conn_timeout for Broadcast Receiver
From: Luiz Augusto von Dentz <[email protected]>
Broadcast Receiver requires creating PA sync but the command just generates a status so this makes use of __hci_cmd_sync_status_sk to wait for HCI_EV_LE_PA_SYNC_ESTABLISHED, also because of this chance it is not longer necessary to use a custom method to serialize the process of creating the PA sync since the cmd_work_sync itself ensures only one command would be pending which now awaits for HCI_EV_LE_PA_SYNC_ESTABLISHED before proceeding to next connection.
--- include/net/bluetooth/hci.h | 2 + include/net/bluetooth/hci_core.h | 13 +++-- include/net/bluetooth/hci_sync.h | 2 + net/bluetooth/hci_conn.c | 92 +------------------------------- net/bluetooth/hci_event.c | 6 +-- net/bluetooth/hci_sync.c | 87 ++++++++++++++++++++++++++++-- 6 files changed, 95 insertions(+), 107 deletions(-)
include/net/bluetooth/hci.h +2 -0
@@ -1931,6 +1931,8 @@ struct hci_cp_le_pa_create_sync {__u8 sync_cte_type; } __packed; +#define HCI_OP_LE_PA_CREATE_SYNC_CANCEL 0x2045 +#define HCI_OP_LE_PA_TERM_SYNC 0x2046struct hci_cp_le_pa_term_sync {__le16 handle;
include/net/bluetooth/hci_core.h +6 -7
@@ -1113,10 +1113,8 @@ static inline struct hci_conn *hci_conn_hash_lookup_bis(struct hci_dev *hdev,return NULL ; } -static inline struct hci_conn *hci_conn_hash_lookup_sid (struct hci_dev *hdev, -__u8 sid, -bdaddr_t *dst, -__u8 dst_type) +static inline struct hci_conn * +hci_conn_hash_lookup_create_pa_sync (struct hci_dev *hdev) {struct hci_conn_hash *h = &hdev->conn_hash;struct hci_conn *c;
@@ -1124,8 +1122,10 @@ static inline struct hci_conn *hci_conn_hash_lookup_sid(struct hci_dev *hdev,rcu_read_lock ();list_for_each_entry_rcu (c, &h->list, list) { -if (c->type !=ISO_LINK ||bacmp (&c->dst, dst) || - c->dst_type != dst_type || c->sid != sid) +if (c->type !=ISO_LINK ) +continue ; + +if (!test_bit (HCI_CONN_CREATE_PA_SYNC , &c->flags))continue ;rcu_read_unlock ();
@@ -1524,7 +1524,6 @@ bool hci_setup_sync(struct hci_conn *conn, __u16 handle);void hci_sco_setup (struct hci_conn *conn,__u8 status);bool hci_iso_setup_path (struct hci_conn *conn);int hci_le_create_cis_pending (struct hci_dev *hdev); -int hci_pa_create_sync_pending (struct hci_dev *hdev);int hci_le_big_create_sync_pending (struct hci_dev *hdev);int hci_conn_check_create_cis (struct hci_conn *conn);
include/net/bluetooth/hci_sync.h +2 -0
@@ -185,3 +185,5 @@ int hci_connect_le_sync(struct hci_dev *hdev, struct hci_conn *conn);int hci_cancel_connect_sync (struct hci_dev *hdev,struct hci_conn *conn);int hci_le_conn_update_sync (struct hci_dev *hdev,struct hci_conn *conn,struct hci_conn_params *params); + +int hci_connect_pa_sync (struct hci_dev *hdev,struct hci_conn *conn);
net/bluetooth/hci_conn.c +2 -90
107 lines not on this page · raw message
net/bluetooth/hci_event.c +1 -5
@@ -6378,8 +6378,7 @@ static void hci_le_pa_sync_estabilished_evt(struct hci_dev *hdev, void *data,hci_dev_clear_flag (hdev,HCI_PA_SYNC ); - conn =hci_conn_hash_lookup_sid (hdev, ev->sid, &ev->bdaddr, - ev->bdaddr_type); + conn =hci_conn_hash_lookup_create_pa_sync (hdev);if (!conn) { bt_dev_err(hdev, "Unable to find connection for dst %pMR sid 0x%2.2x",
@@ -6418,9 +6417,6 @@ static void hci_le_pa_sync_estabilished_evt(struct hci_dev *hdev, void *data, } unlock: -/* Handle any other pending PA sync command */ -hci_pa_create_sync_pending (hdev); -hci_dev_unlock (hdev); }
net/bluetooth/hci_sync.c +82 -5
101 lines not on this page · raw message
Signature · 1 line
2.49.0
RE: [v3,1/2] Bluetooth: hci_conn: Fix not setting conn_timeout for Broadcast Receiver
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=952580
---Test result---
Test Summary:
CheckPatch PENDING 0.28 seconds GitLint PENDING 0.21 seconds SubjectPrefix PASS 0.12 seconds BuildKernel PASS 25.09 seconds CheckAllWarning PASS 28.42 seconds CheckSparse WARNING 31.33 seconds BuildKernel32 PASS 24.96 seconds TestRunnerSetup PASS 471.14 seconds TestRunner_l2cap-tester PASS 21.62 seconds TestRunner_iso-tester PASS 35.32 seconds TestRunner_bnep-tester PASS 4.86 seconds TestRunner_mgmt-tester FAIL 128.17 seconds TestRunner_rfcomm-tester PASS 8.10 seconds TestRunner_sco-tester PASS 14.98 seconds TestRunner_ioctl-tester PASS 8.69 seconds TestRunner_mesh-tester PASS 6.58 seconds TestRunner_smp-tester PASS 7.39 seconds TestRunner_userchan-tester PASS 5.11 seconds IncrementalBuild PENDING 0.39 seconds
Details
##############################
Test: CheckPatch - PENDING
Desc: Run checkpatch.pl script Output:
##############################
Test: GitLint - PENDING
Desc: Run gitlint
Output:
##############################
Test: CheckSparse - WARNING
Desc: Run sparse tool with linux kernel
Output:net/bluetooth/hci_event.c: note: in included file (through include/net/bluetooth/hci_core.h):
##############################
Test: TestRunner_mgmt-tester - FAIL
Desc: Run mgmt-tester with test-runner
Output:
Total: 490, Passed: 484 (98.8%), Failed: 2, Not Run: 4
Failed Test Cases
LL Privacy - Add Device 2 (2 Devices to AL) Failed 0.182 seconds LL Privacy - Add Device 3 (AL is full) Failed 0.205 seconds
##############################
Test: IncrementalBuild - PENDING
Desc: Incremental build with the patches in the series Output:
---
Regards,
Linux Bluetooth
Luiz Augusto von Dentz
maintainerPATCH v3 2/2 Bluetooth: ISO: Fix not using SID from adv report
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
Up until now it has been assumed that the application would be able to enter the advertising SID in sockaddr_iso_bc.bc_sid, but userspace has not access to SID since the likes of MGMT_EV_DEVICE_FOUND cannot carry it, so it was left unset (0x00) which means it would be unable to synchronize if the broadcast source is using a different SID e.g. 0x04:
Quoted 1 line
HCI Event: LE Meta Event (
0x3e) plen 57
LE Extended Advertising Report (0x0d)
Num reports: 1
Entry 0
Event type: 0x0000
Props: 0x0000
Data status: Complete
Address type: Random (0x01)
Address: 0B:82:E8:50:6D:C8 (Non-Resolvable)
Primary PHY: LE 1M
Secondary PHY: LE 2M
SID: 0x04
TX power: 127 dBm
RSSI: -55 dBm (0xc9)
Periodic advertising interval: 180.00 msec (0x0090)
Direct address type: Public (0x00)
Direct address: 00:00:00:00:00:00 (OUI 00-00-00)
Data length: 0x1f
06 16 52 18 5b 0b e1 05 16 56 18 04 00 11 30 4c ..R.[....V....0L
75 69 7a 27 73 20 53 32 33 20 55 6c 74 72 61 uiz's S23 Ultra
Service Data: Broadcast Audio Announcement (0x1852)
Broadcast ID: 14748507 (0xe10b5b)
Service Data: Public Broadcast Announcement (0x1856)
Data[2]: 0400
Unknown EIR field 0x30[16]: 4c75697a27732053323320556c747261
< HCI Command: LE Periodic Advertising Create Sync (0x08|0x0044) plen 14
Options: 0x0000
Use advertising SID, Advertiser Address Type and address
Reporting initially enabled
SID: 0x00 (<- Invalid)
Adv address type: Random (0x01)
Adv address: 0B:82:E8:50:6D:C8 (Non-Resolvable)
Skip: 0x0000
Sync timeout: 20000 msec (0x07d0)
Sync CTE type: 0x0000So instead this changes now allow application to set HCI_SID_INVALID which will make hci_le_pa_create_sync to wait for a report, update the conn->sid using the report SID and only then issue PA create sync command:
< HCI Command: LE Periodic Advertising Create Sync
Options: 0x0000
Use advertising SID, Advertiser Address Type and address
Reporting initially enabled
SID: 0x04
Adv address type: Random (0x01)
Adv address: 0B:82:E8:50:6D:C8 (Non-Resolvable)
Skip: 0x0000
Sync timeout: 20000 msec (0x07d0)
Sync CTE type: 0x0000Quoted 1 line
HCI Event: LE Meta Event (
0x3e) plen 16
LE Periodic Advertising Sync Established (0x0e)
Status: Success (0x00)
Sync handle: 64
Advertising SID: 0x04
Advertiser address type: Random (0x01)
Advertiser address: 0B:82:E8:50:6D:C8 (Non-Resolvable)
Advertiser PHY: LE 2M (0x02)
Periodic advertising interval: 180.00 msec (0x0090)
Advertiser clock accuracy: 0x05--- net/bluetooth/hci_core.c | 13 +++++++------ net/bluetooth/hci_event.c | 11 +++++++++++ net/bluetooth/hci_sync.c | 29 +++++++++++++++++++++++++++++ net/bluetooth/iso.c | 2 +- 4 files changed, 48 insertions(+), 7 deletions(-)
net/bluetooth/hci_core.c +7 -6
@@ -4057,10 +4057,13 @@ static void hci_send_cmd_sync(struct hci_dev *hdev, struct sk_buff *skb)return ; } - err =hci_send_frame (hdev, skb); -if (err <0 ) { -hci_cmd_sync_cancel_sync (hdev, -err); -return ; +if (hci_skb_opcode (skb) !=HCI_OP_NOP ) { + err =hci_send_frame (hdev, skb); +if (err <0 ) { +hci_cmd_sync_cancel_sync (hdev, -err); +return ; + } +atomic_dec (&hdev->cmd_cnt); } if (hdev->req_status == HCI_REQ_PEND &&
@@ -4068,8 +4071,6 @@ static void hci_send_cmd_sync(struct hci_dev *hdev, struct sk_buff *skb)kfree_skb (hdev->req_skb); hdev->req_skb =skb_clone (hdev->sent_cmd,GFP_KERNEL ); } - -atomic_dec (&hdev->cmd_cnt); }static void hci_cmd_work (struct work_struct *work)
net/bluetooth/hci_event.c +11 -0
@@ -6340,6 +6340,17 @@ static void hci_le_ext_adv_report_evt(struct hci_dev *hdev, void *data, info->secondary_phy &=0x1f ; } +/* Check if PA Sync is pending and if the hci_conn SID has not +* been set update it. +*/ +if (hci_dev_test_flag (hdev,HCI_PA_SYNC )) { +struct hci_conn *conn; + + conn =hci_conn_hash_lookup_create_pa_sync (hdev); +if (conn && conn->sid ==HCI_SID_INVALID ) + conn->sid = info->sid; + } +if (legacy_evt_type !=LE_ADV_INVALID ) { process_adv_report(hdev, legacy_evt_type, &info->bdaddr, info->bdaddr_type, NULL, 0,
net/bluetooth/hci_sync.c +29 -0
@@ -6908,6 +6908,8 @@ int hci_le_conn_update_sync(struct hci_dev *hdev, struct hci_conn *conn,static void create_pa_complete (struct hci_dev *hdev,void *data,int err) { +struct hci_conn *pa_sync; +bt_dev_dbg (hdev,"err %d" , err);if (!err)
@@ -6922,6 +6924,22 @@ static void create_pa_complete(struct hci_dev *hdev, void *data, int err)hci_update_passive_scan_sync (hdev); +if (!err) + goto unlock; + +/* Add connection to indicate PA sync error */ + pa_sync =hci_conn_add_unset (hdev,ISO_LINK ,BDADDR_ANY , +HCI_ROLE_SLAVE ); + +if (IS_ERR (pa_sync)) + goto unlock; + +set_bit (HCI_CONN_PA_SYNC_FAILED , &pa_sync->flags); + +/* Notify iso layer */ +hci_connect_cfm (pa_sync,bt_status (err)); + +unlock:hci_dev_unlock (hdev); }
@@ -6935,6 +6953,9 @@ static int hci_le_pa_create_sync(struct hci_dev *hdev, void *data)if (!hci_conn_valid (hdev, conn))return -ECANCELED ; +if (conn->sync_handle !=HCI_SYNC_HANDLE_INVALID ) +return -EINVAL ; +if (hci_dev_test_and_set_flag (hdev,HCI_PA_SYNC ))return -EBUSY ;
@@ -6946,6 +6967,14 @@ static int hci_le_pa_create_sync(struct hci_dev *hdev, void *data)hci_update_passive_scan_sync (hdev); +/* SID has not been set listen for HCI_EV_LE_EXT_ADV_REPORT to update +* it. +*/ +if (conn->sid ==HCI_SID_INVALID ) +__hci_cmd_sync_status_sk (hdev,HCI_OP_NOP ,0 ,NULL , +HCI_EV_LE_EXT_ADV_REPORT , + conn->conn_timeout,NULL ); +memset (&cp,0 ,sizeof (cp)); cp.options = qos->bcast.options; cp.sid = conn->sid;
net/bluetooth/iso.c +1 -1
@@ -941,7 +941,7 @@ static int iso_sock_bind_bc(struct socket *sock, struct sockaddr *addr,iso_pi (sk)->dst_type = sa->iso_bc->bc_bdaddr_type; -if (sa->iso_bc->bc_sid >0x0f ) +if (sa->iso_bc->bc_sid >0x0f && sa->iso_bc->bc_sid !=HCI_SID_INVALID )return -EINVAL ;iso_pi (sk)->bc_sid = sa->iso_bc->bc_sid;
Signature · 1 line
2.49.0
This is an automated email and please do not reply to this email.
Dear Submitter,
Thank you for submitting the patches to the linux bluetooth mailing list.
While preparing the CI tests, the patches you submitted couldn't be applied to the current HEAD of the repository.
----- Output -----
Please resolve the issue and submit the patches again.
---
Regards,
Linux Bluetooth