2023-11-29 10:17:57

by Per Waagø

Subject: [PATCH BlueZ] adapter: Enable SSP after enabling BREDR

When enabling Secure Simple Pairing, the kernel first checks if
BREDR is enabled. If it's not, enabling SSP fails. Therefore, it
is necessary to make sure that BREDR is enabled before enabling
SSP.

Without this fix, bluetoothd would start without SSP enabled if
started in dual or bredr mode after it had been run in le mode.
---
src/adapter.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/adapter.c b/src/adapter.c
index 2c3cf7600..86fff72bc 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -10229,12 +10229,12 @@ static void read_info_complete(uint8_t status, uint16_t length,

switch (btd_opts.mode) {
case BT_MODE_DUAL:
- if (missing_settings & MGMT_SETTING_SSP)
- set_mode(adapter, MGMT_OP_SET_SSP, 0x01);
if (missing_settings & MGMT_SETTING_LE)
set_mode(adapter, MGMT_OP_SET_LE, 0x01);
if (missing_settings & MGMT_SETTING_BREDR)
set_mode(adapter, MGMT_OP_SET_BREDR, 0x01);
+ if (missing_settings & MGMT_SETTING_SSP)
+ set_mode(adapter, MGMT_OP_SET_SSP, 0x01);
break;
case BT_MODE_BREDR:
if (!(adapter->supported_settings & MGMT_SETTING_BREDR)) {
@@ -10243,10 +10243,10 @@ static void read_info_complete(uint8_t status, uint16_t length,
goto failed;
}

- if (missing_settings & MGMT_SETTING_SSP)
- set_mode(adapter, MGMT_OP_SET_SSP, 0x01);
if (missing_settings & MGMT_SETTING_BREDR)
set_mode(adapter, MGMT_OP_SET_BREDR, 0x01);
+ if (missing_settings & MGMT_SETTING_SSP)
+ set_mode(adapter, MGMT_OP_SET_SSP, 0x01);
if (adapter->current_settings & MGMT_SETTING_LE)
set_mode(adapter, MGMT_OP_SET_LE, 0x00);
break;
--
2.42.1

2023-11-29 11:25:16

by bluez.test.bot

Subject: RE: [BlueZ] adapter: Enable SSP after enabling BREDR

This is automated email and please do not reply to this email!

Dear submitter,

Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=805204

---Test result---

Test Summary:
CheckPatch PASS 0.44 seconds
GitLint PASS 0.30 seconds
BuildEll PASS 23.91 seconds
BluezMake PASS 557.52 seconds
MakeCheck PASS 10.82 seconds
MakeDistcheck PASS 152.48 seconds
CheckValgrind PASS 210.35 seconds
CheckSmatch PASS 312.14 seconds
bluezmakeextell PASS 96.32 seconds
IncrementalBuild PASS 510.60 seconds
ScanBuild PASS 883.24 seconds



---
Regards,
Linux Bluetooth

2023-12-05 03:40:49

by patchwork-bot+bluetooth

Subject: Re: [PATCH BlueZ] adapter: Enable SSP after enabling BREDR

Hello:

This patch was applied to bluetooth/bluez.git (master)
by Luiz Augusto von Dentz <[email protected]>:

On Wed, 29 Nov 2023 11:16:27 +0100 you wrote:
> When enabling Secure Simple Pairing, the kernel first checks if
> BREDR is enabled. If it's not, enabling SSP fails. Therefore, it
> is necessary to make sure that BREDR is enabled before enabling
> SSP.
>
> Without this fix, bluetoothd would start without SSP enabled if
> started in dual or bredr mode after it had been run in le mode.
>
> [...]

Here is the summary with links:
- [BlueZ] adapter: Enable SSP after enabling BREDR
https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=227e16f5c987

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html