diff options
Diffstat (limited to 'target/linux/bcm27xx/patches-5.10/950-0495-Revert-Bluetooth-Always-request-for-user-confirmatio.patch')
| -rw-r--r-- | target/linux/bcm27xx/patches-5.10/950-0495-Revert-Bluetooth-Always-request-for-user-confirmatio.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/target/linux/bcm27xx/patches-5.10/950-0495-Revert-Bluetooth-Always-request-for-user-confirmatio.patch b/target/linux/bcm27xx/patches-5.10/950-0495-Revert-Bluetooth-Always-request-for-user-confirmatio.patch new file mode 100644 index 0000000000..77b1b5693e --- /dev/null +++ b/target/linux/bcm27xx/patches-5.10/950-0495-Revert-Bluetooth-Always-request-for-user-confirmatio.patch @@ -0,0 +1,45 @@ +From 637d132b72c9208e086b71fbf39954cff3fb851c Mon Sep 17 00:00:00 2001 +From: Phil Elwell <phil@raspberrypi.com> +Date: Mon, 1 Mar 2021 09:12:44 +0000 +Subject: [PATCH] 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 <phil@raspberrypi.com> +--- + net/bluetooth/smp.c | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +--- a/net/bluetooth/smp.c ++++ b/net/bluetooth/smp.c +@@ -2201,7 +2201,7 @@ mackey_and_ltk: + 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); +@@ -2216,9 +2216,6 @@ mackey_and_ltk: + 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) |