lkml.org 
[lkml]   [2021]   [Mar]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 060/663] Bluetooth: Put HCI device if inquiry procedure interrupts
    Date
    From: Pan Bian <bianpan2016@163.com>

    [ Upstream commit 28a758c861ff290e39d4f1ee0aa5df0f0b9a45ee ]

    Jump to the label done to decrement the reference count of HCI device
    hdev on path that the Inquiry procedure is interrupted.

    Fixes: 3e13fa1e1fab ("Bluetooth: Fix hci_inquiry ioctl usage")
    Signed-off-by: Pan Bian <bianpan2016@163.com>
    Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/bluetooth/hci_core.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
    index c4aa2cbb92697..555058270f112 100644
    --- a/net/bluetooth/hci_core.c
    +++ b/net/bluetooth/hci_core.c
    @@ -1356,8 +1356,10 @@ int hci_inquiry(void __user *arg)
    * cleared). If it is interrupted by a signal, return -EINTR.
    */
    if (wait_on_bit(&hdev->flags, HCI_INQUIRY,
    - TASK_INTERRUPTIBLE))
    - return -EINTR;
    + TASK_INTERRUPTIBLE)) {
    + err = -EINTR;
    + goto done;
    + }
    }

    /* for unlimited number of responses we will use buffer with
    --
    2.27.0


    \
     
     \ /
      Last update: 2021-03-02 00:40    [W:4.221 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site