Patch "bluetooth/hci: disallow setting handle bigger than HCI_CONN_HANDLE_MAX" has been added to the 6.9-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    bluetooth/hci: disallow setting handle bigger than HCI_CONN_HANDLE_MAX

to the 6.9-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     bluetooth-hci-disallow-setting-handle-bigger-than-hc.patch
and it can be found in the queue-6.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 27d5a931b12a4272b2282e028603137f3978ec74
Author: Pavel Skripkin <paskripkin@xxxxxxxxx>
Date:   Thu Jun 20 22:27:47 2024 +0300

    bluetooth/hci: disallow setting handle bigger than HCI_CONN_HANDLE_MAX
    
    [ Upstream commit 1cc18c2ab2e8c54c355ea7c0423a636e415a0c23 ]
    
    Syzbot hit warning in hci_conn_del() caused by freeing handle that was
    not allocated using ida allocator.
    
    This is caused by handle bigger than HCI_CONN_HANDLE_MAX passed by
    hci_le_big_sync_established_evt(), which makes code think it's unset
    connection.
    
    Add same check for handle upper bound as in hci_conn_set_handle() to
    prevent warning.
    
    Link: https://syzkaller.appspot.com/bug?extid=b2545b087a01a7319474
    Reported-by: syzbot+b2545b087a01a7319474@xxxxxxxxxxxxxxxxxxxxxxxxx
    Fixes: 181a42edddf5 ("Bluetooth: Make handle of hci_conn be unique")
    Signed-off-by: Pavel Skripkin <paskripkin@xxxxxxxxx>
    Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@xxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index 08ae30fd31551..baca48ce8d0c6 100644
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -904,8 +904,8 @@ static int hci_conn_hash_alloc_unset(struct hci_dev *hdev)
 			       U16_MAX, GFP_ATOMIC);
 }
 
-struct hci_conn *hci_conn_add(struct hci_dev *hdev, int type, bdaddr_t *dst,
-			      u8 role, u16 handle)
+static struct hci_conn *__hci_conn_add(struct hci_dev *hdev, int type, bdaddr_t *dst,
+				       u8 role, u16 handle)
 {
 	struct hci_conn *conn;
 
@@ -1046,7 +1046,16 @@ struct hci_conn *hci_conn_add_unset(struct hci_dev *hdev, int type,
 	if (unlikely(handle < 0))
 		return ERR_PTR(-ECONNREFUSED);
 
-	return hci_conn_add(hdev, type, dst, role, handle);
+	return __hci_conn_add(hdev, type, dst, role, handle);
+}
+
+struct hci_conn *hci_conn_add(struct hci_dev *hdev, int type, bdaddr_t *dst,
+			      u8 role, u16 handle)
+{
+	if (handle > HCI_CONN_HANDLE_MAX)
+		return ERR_PTR(-EINVAL);
+
+	return __hci_conn_add(hdev, type, dst, role, handle);
 }
 
 static void hci_conn_cleanup_child(struct hci_conn *conn, u8 reason)