lkml.org 
[lkml]   [2022]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6.0 710/862] Bluetooth: hci_event: Make sure ISO events dont affect non-ISO connections
    Date
    From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

    [ Upstream commit ed680f925aea76ac666f34d9923cb40558f4e97b ]

    ISO events (CIS/BIS) shall only be relevant for connection with link
    type of ISO_LINK, otherwise the controller is probably buggy or it is
    the result of fuzzer tools such as syzkaller.

    Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/bluetooth/hci_event.c | 14 ++++++++++++++
    1 file changed, 14 insertions(+)

    diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
    index d6f0e6ca0e7e..ab79a978deb5 100644
    --- a/net/bluetooth/hci_event.c
    +++ b/net/bluetooth/hci_event.c
    @@ -6778,6 +6778,13 @@ static void hci_le_cis_estabilished_evt(struct hci_dev *hdev, void *data,
    goto unlock;
    }

    + if (conn->type != ISO_LINK) {
    + bt_dev_err(hdev,
    + "Invalid connection link type handle 0x%4.4x",
    + handle);
    + goto unlock;
    + }
    +
    if (conn->role == HCI_ROLE_SLAVE) {
    __le32 interval;

    @@ -6898,6 +6905,13 @@ static void hci_le_create_big_complete_evt(struct hci_dev *hdev, void *data,
    if (!conn)
    goto unlock;

    + if (conn->type != ISO_LINK) {
    + bt_dev_err(hdev,
    + "Invalid connection link type handle 0x%2.2x",
    + ev->handle);
    + goto unlock;
    + }
    +
    if (ev->num_bis)
    conn->handle = __le16_to_cpu(ev->bis_handle[0]);

    --
    2.35.1


    \
     
     \ /
      Last update: 2022-10-19 11:33    [W:2.361 / U:1.188 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site