lkml.org 
[lkml]   [2020]   [Jan]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 39/91] Bluetooth: Fix memory leak in hci_connect_le_scan
    Date
    From: Navid Emamdoost <navid.emamdoost@gmail.com>

    commit d088337c38a5cd8f0230fbf2d514ff7672f9d0d3 upstream.

    In the implementation of hci_connect_le_scan() when conn is added via
    hci_conn_add(), if hci_explicit_conn_params_set() fails the allocated
    memory for conn is leaked. Use hci_conn_del() to release it.

    Fixes: f75113a26008 ("Bluetooth: add hci_connect_le_scan")
    Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com>
    Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    net/bluetooth/hci_conn.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    --- a/net/bluetooth/hci_conn.c
    +++ b/net/bluetooth/hci_conn.c
    @@ -1054,8 +1054,10 @@ struct hci_conn *hci_connect_le_scan(str
    if (!conn)
    return ERR_PTR(-ENOMEM);

    - if (hci_explicit_conn_params_set(hdev, dst, dst_type) < 0)
    + if (hci_explicit_conn_params_set(hdev, dst, dst_type) < 0) {
    + hci_conn_del(conn);
    return ERR_PTR(-EBUSY);
    + }

    conn->state = BT_CONNECT;
    set_bit(HCI_CONN_SCANNING, &conn->flags);

    \
     
     \ /
      Last update: 2020-01-11 11:02    [W:4.168 / U:0.492 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site