[v2,1/3] Bluetooth: hci_conn: Fix UAF Write in __hci_acl_create_connection_sync

Commit Message

Luiz Augusto von Dentz Feb. 13, 2024, 9:31 p.m. UTC

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

This fixes the UAF on __hci_acl_create_connection_sync caused by
connection abortion, it uses the same logic as to LE_LINK which uses
hci_cmd_sync_cancel to prevent the callback to run if the connection is
abort prematurely.

Reported-by: [e-mail]
Fixes: 456561ba8e49 ("Bluetooth: hci_conn: Only do ACL connections sequentially")
Signed-off-by: Luiz Augusto von Dentz <[e-mail]>
---
 include/net/bluetooth/hci_sync.h |  3 +--
 net/bluetooth/hci_conn.c         |  3 ++-
 net/bluetooth/hci_sync.c         | 16 ++++++++++------
 3 files changed, 13 insertions(+), 9 deletions(-)

Comments

[e-mail] Feb. 13, 2024, 9:59 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=825785

---Test result---

Test Summary:
CheckPatch                    FAIL      3.38 seconds
GitLint                       PASS      0.94 seconds
SubjectPrefix                 PASS      0.36 seconds
BuildKernel                   PASS      27.69 seconds
CheckAllWarning               PASS      30.21 seconds
CheckSparse                   PASS      35.97 seconds
CheckSmatch                   PASS      98.24 seconds
BuildKernel32                 PASS      26.93 seconds
TestRunnerSetup               PASS      501.35 seconds
TestRunner_l2cap-tester       FAIL      12.30 seconds
TestRunner_iso-tester         PASS      31.44 seconds
TestRunner_bnep-tester        PASS      4.92 seconds
TestRunner_mgmt-tester        FAIL      171.41 seconds
TestRunner_rfcomm-tester      PASS      7.45 seconds
TestRunner_sco-tester         PASS      15.09 seconds
TestRunner_ioctl-tester       PASS      7.92 seconds
TestRunner_mesh-tester        PASS      5.93 seconds
TestRunner_smp-tester         PASS      6.97 seconds
TestRunner_userchan-tester    PASS      5.02 seconds
IncrementalBuild              PASS      74.76 seconds

Details
##############################
Test: CheckPatch - FAIL
Desc: Run checkpatch.pl script
Output:
[v2,1/3] Bluetooth: hci_conn: Fix UAF Write in __hci_acl_create_connection_sync
WARNING: Reported-by: should be immediately followed by Closes: with a URL to the report
#97: 
Reported-by: [e-mail]
Fixes: 456561ba8e49 ("Bluetooth: hci_conn: Only do ACL connections sequentially")

total: 0 errors, 1 warnings, 0 checks, 53 lines checked

NOTE: For some of the reported defects, checkpatch may be able to
      mechanically convert to the typical style using --fix or --fix-inplace.

/github/workspace/src/src/13555669.patch has style problems, please review.

NOTE: Ignored message types: UNKNOWN_COMMIT_ID

NOTE: If any of the errors are false positives, please report
      them to the maintainer, see CHECKPATCH in MAINTAINERS.


##############################
Test: TestRunner_l2cap-tester - FAIL
Desc: Run l2cap-tester with test-runner
Output:
No test result found
##############################
Test: TestRunner_mgmt-tester - FAIL
Desc: Run mgmt-tester with test-runner
Output:
Total: 492, Passed: 486 (98.8%), Failed: 5, Not Run: 1

Failed Test Cases
LL Privacy - Add Device 5 (2 Devices to RL)          Failed       0.119 seconds
LL Privacy - Add Device 6 (RL is full)               Failed       0.143 seconds
LL Privacy - Remove Device 1 (Remove from AL)        Timed out    2.199 seconds
LL Privacy - Remove Device 2 (Remove from RL)        Timed out    1.999 seconds
LL Privacy - Remove Device 4 (Disable Adv)           Timed out    1.839 seconds


---
Regards,
Linux Bluetooth

[e-mail] Feb. 15, 2024, 9:20 p.m. UTC | #2

Hello:

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

On Tue, 13 Feb 2024 16:31:21 -0500 you wrote:
> From: Luiz Augusto von Dentz <[e-mail]>
> 
> This fixes the UAF on __hci_acl_create_connection_sync caused by
> connection abortion, it uses the same logic as to LE_LINK which uses
> hci_cmd_sync_cancel to prevent the callback to run if the connection is
> abort prematurely.
> 
> [...]

Here is the summary with links:
  - [v2,1/3] Bluetooth: hci_conn: Fix UAF Write in __hci_acl_create_connection_sync
    https://git.kernel.org/bluetooth/bluetooth-next/c/f36e87456bf6
  - [v2,2/3] Bluetooth: hci_sync: Add helper functions to manipulate cmd_sync queue
    https://git.kernel.org/bluetooth/bluetooth-next/c/4a8a8f446ef2
  - [v2,3/3] Bluetooth: hci_sync: Attempt to dequeue connection attempt
    https://git.kernel.org/bluetooth/bluetooth-next/c/96fb2aab16bf

You are awesome, thank you!

Patch

diff --git a/include/net/bluetooth/hci_sync.h b/include/net/bluetooth/hci_sync.h
index 824660f8f30d..ed334c253ebc 100644
--- a/include/net/bluetooth/hci_sync.h
+++ b/include/net/bluetooth/hci_sync.h
@@ -139,5 +139,4 @@  int hci_le_big_terminate_sync(struct hci_dev *hdev, u8 handle);
 
 int hci_le_pa_terminate_sync(struct hci_dev *hdev, u16 handle);
 
-int hci_acl_create_connection_sync(struct hci_dev *hdev,
-				   struct hci_conn *conn);
+int hci_connect_acl_sync(struct hci_dev *hdev, struct hci_conn *conn);
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index 8164502234c5..587eb27f374c 100644
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -1645,7 +1645,7 @@  struct hci_conn *hci_connect_acl(struct hci_dev *hdev, bdaddr_t *dst,
 		acl->auth_type = auth_type;
 		acl->conn_timeout = timeout;
 
-		err = hci_acl_create_connection_sync(hdev, acl);
+		err = hci_connect_acl_sync(hdev, acl);
 		if (err) {
 			hci_conn_del(acl);
 			return ERR_PTR(err);
@@ -2942,6 +2942,7 @@  int hci_abort_conn(struct hci_conn *conn, u8 reason)
 	 */
 	if (conn->state == BT_CONNECT && hdev->req_status == HCI_REQ_PEND) {
 		switch (hci_skb_event(hdev->sent_cmd)) {
+		case HCI_EV_CONN_COMPLETE:
 		case HCI_EV_LE_CONN_COMPLETE:
 		case HCI_EV_LE_ENHANCED_CONN_COMPLETE:
 		case HCI_EVT_LE_CIS_ESTABLISHED:
diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c
index 788a889210d8..e1fdcb3c2706 100644
--- a/net/bluetooth/hci_sync.c
+++ b/net/bluetooth/hci_sync.c
@@ -6493,13 +6493,18 @@  int hci_update_adv_data(struct hci_dev *hdev, u8 instance)
 				  UINT_PTR(instance), NULL);
 }
 
-static int __hci_acl_create_connection_sync(struct hci_dev *hdev, void *data)
+static int hci_acl_create_conn_sync(struct hci_dev *hdev, void *data)
 {
-	struct hci_conn *conn = data;
+	struct hci_conn *conn;
+	u16 handle = PTR_UINT(data);
 	struct inquiry_entry *ie;
 	struct hci_cp_create_conn cp;
 	int err;
 
+	conn = hci_conn_hash_lookup_handle(hdev, handle);
+	if (!conn)
+		return 0;
+
 	/* Many controllers disallow HCI Create Connection while it is doing
 	 * HCI Inquiry. So we cancel the Inquiry first before issuing HCI Create
 	 * Connection. This may cause the MGMT discovering state to become false
@@ -6556,9 +6561,8 @@  static int __hci_acl_create_connection_sync(struct hci_dev *hdev, void *data)
 	return err;
 }
 
-int hci_acl_create_connection_sync(struct hci_dev *hdev,
-				   struct hci_conn *conn)
+int hci_connect_acl_sync(struct hci_dev *hdev, struct hci_conn *conn)
 {
-	return hci_cmd_sync_queue(hdev, __hci_acl_create_connection_sync,
-				  conn, NULL);
+	return hci_cmd_sync_queue(hdev, hci_acl_create_conn_sync,
+				  UINT_PTR(conn->handle), NULL);
 }