diff options
| author |   Navid Emamdoost <navid.emamdoost@gmail.com> | 2019-11-21 14:20:36 -0600 |
|---|---|---|
| committer |   Marcel Holtmann <marcel@holtmann.org> | 2019-11-22 10:42:53 +0100 |
| commit | d088337c38a5cd8f0230fbf2d514ff7672f9d0d3 (patch) | |
| tree | ea3b7f9b0c741779543d39c631b1f160ad0a298d /net/bluetooth/hci_conn.c | |
| parent | Bluetooth: Allow combination of BDADDR_PROPERTY and INVALID_BDADDR quirks (diff) | |
| download | linux-dev-d088337c38a5cd8f0230fbf2d514ff7672f9d0d3.tar.xz linux-dev-d088337c38a5cd8f0230fbf2d514ff7672f9d0d3.zip | |
Bluetooth: Fix memory leak in hci_connect_le_scan
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>
Diffstat (limited to 'net/bluetooth/hci_conn.c')
| -rw-r--r-- | net/bluetooth/hci_conn.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c index 7ff92dd4c53c..87691404d0c6 100644 --- a/net/bluetooth/hci_conn.c +++ b/net/bluetooth/hci_conn.c @@ -1176,8 +1176,10 @@ struct hci_conn *hci_connect_le_scan(struct hci_dev *hdev, bdaddr_t *dst, 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); |