2020-09-24 23:18:28

by Yu Liu

[permalink] [raw]
Subject: [Bluez PATCH v2] device: Disable auto connect for temporary devices

When connecting a LE keyboard, if the user input the wrong passkey, the
stack would keep auto connect and thus allow the user to retry the
passkey indefinitely which is a security concern. This fix would
disallow the auto connect if the authentication failed.

---

Changes in v2:
- Move the logic into btd_device_set_temporary

Changes in v1:
- Initial change

src/device.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/device.c b/src/device.c
index a4b5968d4..13159d927 100644
--- a/src/device.c
+++ b/src/device.c
@@ -5684,6 +5684,10 @@ void btd_device_set_temporary(struct btd_device *device, bool temporary)
if (device->bredr)
adapter_whitelist_remove(device->adapter, device);
adapter_connect_list_remove(device->adapter, device);
+ if (device->auto_connect) {
+ device->disable_auto_connect = TRUE;
+ device_set_auto_connect(device, FALSE);
+ }
device->temporary_timer = g_timeout_add_seconds(main_opts.tmpto,
device_disappeared,
device);
@@ -6036,8 +6040,9 @@ void device_bonding_complete(struct btd_device *device, uint8_t bdaddr_type,
* treated as a newly discovered device.
*/
if (!device_is_paired(device, bdaddr_type) &&
- !device_is_trusted(device))
+ !device_is_trusted(device)) {
btd_device_set_temporary(device, true);
+ }

device_bonding_failed(device, status);
return;
--
2.28.0.681.g6f77f65b4e-goog