Bluetooth: hci_event: Align BR/EDR JUST_WORKS paring with LE
Subsystems (2)
Luiz Augusto von Dentz
maintainerPATCH 1/1 Bluetooth: hci_event: Align BR/EDR JUST_WORKS paring with LE
From: Luiz Augusto von Dentz <[email protected]>
This aligned BR/EDR JUST_WORKS method with LE which since 92516cd97fd4 ("Bluetooth: Always request for user confirmation for Just Works") always request user confirmation with confirm_hint set since the likes of bluetoothd have dedicated policy around JUST_WORKS method (e.g. main.conf:JustWorksRepairing).
Fixes ba15a58b179e ("Bluetooth: Fix SSP acceptor just-works confirmation without MITM")
Signed-off-by Luiz Augusto von Dentz <[email protected]>
--- net/bluetooth/hci_core.c | 2 ++ net/bluetooth/hci_event.c | 18 ++++++------------ net/bluetooth/l2cap_core.c | 8 -------- 3 files changed, 8 insertions(+), 20 deletions(-)
net/bluetooth/hci_core.c +2 -0
@@ -3782,6 +3782,8 @@ static void hci_acldata_packet(struct hci_dev *hdev, struct sk_buff *skb)hci_dev_lock (hdev); conn =hci_conn_hash_lookup_handle (hdev, handle); +if (conn &&hci_dev_test_flag (hdev,HCI_MGMT )) +mgmt_device_connected (hdev, conn,NULL ,0 );hci_dev_unlock (hdev);if (conn) {
net/bluetooth/hci_event.c +6 -12
@@ -3706,7 +3706,7 @@ static void hci_remote_features_evt(struct hci_dev *hdev, void *data, goto unlock; } -if (!ev->status && !test_bit (HCI_CONN_MGMT_CONNECTED , &conn->flags)) { +if (!ev->status) {struct hci_cp_remote_name_req cp;memset (&cp,0 ,sizeof (cp));bacpy (&cp.bdaddr, &conn->dst);
@@ -5324,19 +5324,17 @@ static void hci_user_confirm_request_evt(struct hci_dev *hdev, void *data, goto unlock; } -/* If no side requires MITM protection; auto-accept */ +/* If no side requires MITM protection; use JUST_CFM method */ if ((!loc_mitm || conn->remote_cap ==HCI_IO_NO_INPUT_OUTPUT ) && (!rem_mitm || conn->io_capability ==HCI_IO_NO_INPUT_OUTPUT )) {/* If we're not the initiators request authorization to -* proceed from user space (mgmt_user_confirm with -* confirm_hint set to 1). The exception is if neither -* side had MITM or if the local IO capability is -* NoInputNoOutput, in which case we do auto-accept +* proceed from user space and the local IO capability is +* NoInputNoOutput, use JUST_WORKS method (mgmt_user_confirm +* with confirm_hint set to 1). */ if (!test_bit (HCI_CONN_AUTH_PEND , &conn->flags) && - conn->io_capability !=HCI_IO_NO_INPUT_OUTPUT && - (loc_mitm || rem_mitm)) { + conn->io_capability !=HCI_IO_NO_INPUT_OUTPUT ) {bt_dev_dbg (hdev,"Confirming auto-accept as acceptor" ); confirm_hint =1 ; goto confirm;
@@ -5361,10 +5359,6 @@ static void hci_user_confirm_request_evt(struct hci_dev *hdev, void *data, &conn->auto_accept_work, delay); goto unlock; } - -hci_send_cmd (hdev,HCI_OP_USER_CONFIRM_REPLY , -sizeof (ev->bdaddr), &ev->bdaddr); - goto unlock; } confirm:
net/bluetooth/l2cap_core.c +0 -8
@@ -4066,17 +4066,9 @@ static void l2cap_connect(struct l2cap_conn *conn, struct l2cap_cmd_hdr *cmd,static int l2cap_connect_req (struct l2cap_conn *conn,struct l2cap_cmd_hdr *cmd,u16 cmd_len,u8 *data) { -struct hci_dev *hdev = conn->hcon->hdev; -struct hci_conn *hcon = conn->hcon; -if (cmd_len <sizeof (struct l2cap_conn_req ))return -EPROTO ; -hci_dev_lock (hdev); -if (hci_dev_test_flag (hdev,HCI_MGMT )) -mgmt_device_connected (hdev, hcon,NULL ,0 ); -hci_dev_unlock (hdev); -l2cap_connect (conn, cmd, data,L2CAP_CONN_RSP );return 0 ; }
Signature · 1 line
2.46.0