From b0bb01820a0ef2ddd1aeb264f0e2d2e7f7647f89 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 1 Mar 2021 09:12:44 +0000 Subject: [PATCH 079/726] Revert "Bluetooth: Always request for user confirmation for Just Works (LE SC)" This reverts commit ffee202a78c2980688bc5d2f7d56480e69a5e0c9. The commit "Bluetooth: Always request for user confirmation for Just Works" prevents BLE devices pairing in (at least) the Raspberry Pi OS GUI. After reverting it, pairing works again. Although this companion commit ("... (LE SC)") has not been demonstrated to be problematic, it follows the same logic and therefore could affect some use cases. If another solution to the problem is found then this reversion will be removed. See: https://github.com/raspberrypi/linux/issues/4139 Signed-off-by: Phil Elwell --- net/bluetooth/smp.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c index 70663229b3cc..903221ad7611 100644 --- a/net/bluetooth/smp.c +++ b/net/bluetooth/smp.c @@ -2207,7 +2207,7 @@ static u8 smp_cmd_pairing_random(struct l2cap_conn *conn, struct sk_buff *skb) if (err) return SMP_UNSPECIFIED; - if (smp->method == REQ_OOB) { + if (smp->method == JUST_WORKS || smp->method == REQ_OOB) { if (hcon->out) { sc_dhkey_check(smp); SMP_ALLOW_CMD(smp, SMP_CMD_DHKEY_CHECK); @@ -2222,9 +2222,6 @@ static u8 smp_cmd_pairing_random(struct l2cap_conn *conn, struct sk_buff *skb) confirm_hint = 0; confirm: - if (smp->method == JUST_WORKS) - confirm_hint = 1; - err = mgmt_user_confirm_request(hcon->hdev, &hcon->dst, hcon->type, hcon->dst_type, passkey, confirm_hint); if (err) -- 2.33.1