lkml.org 
[lkml]   [2022]   [Sep]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.19 032/155] Bluetooth: hci_sync: hold hdev->lock when cleanup hci_conn
    Date
    From: Zhengping Jiang <jiangzp@google.com>

    [ Upstream commit 2da8eb834b775a9d1acea6214d3e4a78ac841e6e ]

    When disconnecting all devices, hci_conn_failed is used to cleanup
    hci_conn object when the hci_conn object cannot be aborted.
    The function hci_conn_failed requires the caller holds hdev->lock.

    Fixes: 9b3628d79b46f ("Bluetooth: hci_sync: Cleanup hci_conn if it cannot be aborted")
    Signed-off-by: Zhengping Jiang <jiangzp@google.com>
    Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/bluetooth/hci_sync.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c
    index 2012f23158839..3b4cee67bbd60 100644
    --- a/net/bluetooth/hci_sync.c
    +++ b/net/bluetooth/hci_sync.c
    @@ -4452,9 +4452,11 @@ static int hci_abort_conn_sync(struct hci_dev *hdev, struct hci_conn *conn,
    /* Cleanup hci_conn object if it cannot be cancelled as it
    * likelly means the controller and host stack are out of sync.
    */
    - if (err)
    + if (err) {
    + hci_dev_lock(hdev);
    hci_conn_failed(conn, err);
    -
    + hci_dev_unlock(hdev);
    + }
    return err;
    case BT_CONNECT2:
    return hci_reject_conn_sync(hdev, conn, reason);
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-09-06 16:28    [W:4.024 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site