[v1] Bluetooth: hci_event: Fix handling of HCI_EV_IO_CAPA_REQUEST

Commit Message

Luiz Augusto von Dentz Jan. 22, 2024, 4:15 p.m. UTC

From: Luiz Augusto von Dentz <[e-mail]>

If we received HCI_EV_IO_CAPA_REQUEST while
HCI_OP_READ_REMOTE_EXT_FEATURES is yet to be responded assume the remote
does support SSP since otherwise this event shouldn't be generated.

Link: https://lore.kernel.org/linux-bluetooth/[e-mail]/T/#t
Fixes: c7f59461f5a7 ("Bluetooth: Fix a refcnt underflow problem for hci_conn")
Signed-off-by: Luiz Augusto von Dentz <[e-mail]>
---
 net/bluetooth/hci_event.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Comments

[e-mail] Jan. 22, 2024, 5:02 p.m. UTC | #1

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=818691

---Test result---

Test Summary:
CheckPatch                    PASS      0.52 seconds
GitLint                       FAIL      0.55 seconds
SubjectPrefix                 PASS      0.09 seconds
BuildKernel                   PASS      28.24 seconds
CheckAllWarning               PASS      30.11 seconds
CheckSparse                   WARNING   46.14 seconds
CheckSmatch                   WARNING   105.09 seconds
BuildKernel32                 PASS      34.58 seconds
TestRunnerSetup               PASS      429.32 seconds
TestRunner_l2cap-tester       PASS      32.05 seconds
TestRunner_iso-tester         PASS      52.07 seconds
TestRunner_bnep-tester        PASS      14.42 seconds
TestRunner_mgmt-tester        PASS      155.89 seconds
TestRunner_rfcomm-tester      PASS      17.83 seconds
TestRunner_sco-tester         PASS      18.38 seconds
TestRunner_ioctl-tester       PASS      15.94 seconds
TestRunner_mesh-tester        PASS      13.33 seconds
TestRunner_smp-tester         PASS      15.40 seconds
TestRunner_userchan-tester    PASS      10.14 seconds
IncrementalBuild              PASS      38.22 seconds

Details
##############################
Test: GitLint - FAIL
Desc: Run gitlint
Output:
[v1] Bluetooth: hci_event: Fix handling of HCI_EV_IO_CAPA_REQUEST

WARNING: I3 - ignore-body-lines: gitlint will be switching from using Python regex 'match' (match beginning) to 'search' (match anywhere) semantics. Please review your ignore-body-lines.regex option accordingly. To remove this warning, set general.regex-style-search=True. More details: https://jorisroovers.github.io/gitlint/configuration/#regex-style-search
9: B1 Line exceeds max length (117>80): "Link: https://lore.kernel.org/linux-bluetooth/[e-mail]/T/#t"
##############################
Test: CheckSparse - WARNING
Desc: Run sparse tool with linux kernel
Output:
net/bluetooth/hci_event.c: note: in included file (through include/net/bluetooth/hci_core.h):
##############################
Test: CheckSmatch - WARNING
Desc: Run smatch tool with source
Output:
net/bluetooth/hci_event.c: note: in included file (through include/net/bluetooth/hci_core.h):


---
Regards,
Linux Bluetooth

[e-mail] Jan. 25, 2024, 8:50 p.m. UTC | #2

Hello:

This patch was applied to bluetooth/bluetooth-next.git (master)
by Luiz Augusto von Dentz <[e-mail]>:

On Mon, 22 Jan 2024 11:15:21 -0500 you wrote:
> From: Luiz Augusto von Dentz <[e-mail]>
> 
> If we received HCI_EV_IO_CAPA_REQUEST while
> HCI_OP_READ_REMOTE_EXT_FEATURES is yet to be responded assume the remote
> does support SSP since otherwise this event shouldn't be generated.
> 
> Link: https://lore.kernel.org/linux-bluetooth/[e-mail]/T/#t
> Fixes: c7f59461f5a7 ("Bluetooth: Fix a refcnt underflow problem for hci_conn")
> Signed-off-by: Luiz Augusto von Dentz <[e-mail]>
> 
> [...]

Here is the summary with links:
  - [v1] Bluetooth: hci_event: Fix handling of HCI_EV_IO_CAPA_REQUEST
    https://git.kernel.org/bluetooth/bluetooth-next/c/c931eafc5a82

You are awesome, thank you!

Patch

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 6130c969f361..a15924db83d9 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -5327,9 +5327,12 @@  static void hci_io_capa_request_evt(struct hci_dev *hdev, void *data,
 	hci_dev_lock(hdev);
 
 	conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &ev->bdaddr);
-	if (!conn || !hci_conn_ssp_enabled(conn))
+	if (!conn || !hci_dev_test_flag(hdev, HCI_SSP_ENABLED))
 		goto unlock;
 
+	/* Assume remote supports SSP since it has triggered this event */
+	set_bit(HCI_CONN_SSP_ENABLED, &conn->flags);
+
 	hci_conn_hold(conn);
 
 	if (!hci_dev_test_flag(hdev, HCI_MGMT))