Skip to contentSkip to conversation

Bluetooth: hci_event: Align BR/EDR JUST_WORKS paring with LE

PATCH Applied Luiz Augusto von Dentz 3 participants 3 messages Sep 12, 2024 – Sep 25, 2024

Subsystems (2)
lore
Share & tools
lore

Luiz Augusto von Dentz

author maintainer
#0 lore raw

PATCH v2 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")
---
 net/bluetooth/hci_event.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)
net/bluetooth/hci_event.c +5 -8
index 1c82dcdf6e8f..c93c76d455f7 100644
@@ -5324,19 +5324,16 @@ 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
+		/* If we're not the initiator of request authorization and the
+		 * local IO capability is not 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;
Signature · 1 line
2.46.0
Tested-by on v2 1/1
#1 lore raw

Hi Luiz,

Quoted 15 lines

-----Original Message-----
From: Luiz Augusto von Dentz <[email protected]>
Sent: Thursday, September 12, 2024 9:47 PM
To: [email protected]
Subject: [PATCH v2] 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).

Quoted 4 lines
Fixes ba15a58b179e ("Bluetooth: Fix SSP acceptor just-works confirmation

without MITM")

Quoted 35 lines

---
net/bluetooth/hci_event.c | 13 +++++--------

1 file changed, 5 insertions(+), 8 deletions(-)
net/bluetooth/hci_event.c index renamed from net/bluetooth/hci_event.c +0 -0

1c82dcdf6e8f..c93c76d455f7 100644

net/bluetooth/hci_event.c +1 -1
@@ -5324,19 +5324,16 @@ 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))

{

net/bluetooth/hci_event.c +2 -5
-		/* 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
+		/* If we're not the initiator of request authorization and the
+		 * local IO capability is not NoInputNoOutput, use

JUST_WORKS

net/bluetooth/hci_event.c +1 -0
+		 * method (mgmt_user_confirm with confirm_hint set to 1).
		 */
		if (!test_bit(HCI_CONN_AUTH_PEND, &conn->flags) &&
net/bluetooth/hci_event.c +1 -2
-		    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

Quoted 6 lines
acceptor");
			confirm_hint = 1;
			goto confirm;

--
2.46.0

Thanks,
Kiran

#2 lore raw
In reply to Luiz Augusto von Dentz
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 9 lines · On Thu, 12 Sep 2024 12:17:00 -0400 you wrote:

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).

[...]

Here is the summary with links:
- [v2] Bluetooth: hci_event: Align BR/EDR JUST_WORKS paring with LE

    https://git.kernel.org/bluetooth/bluetooth-next/c/257d7307d348

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html