diff options
| author | Navid Emamdoost <navid.emamdoost@gmail.com> | 2019-11-21 14:20:36 -0600 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-01-09 10:19:04 +0100 |
| commit | dfde3147c6a705b663175c0545efc34929a55ee5 (patch) | |
| tree | c7fe88b64abc3af174e78d32058bb0e589e07880 | |
| parent | cf223ff1a2a55143c8fb5abe440fcbb2e2ffb0f4 (diff) | |
| download | linux-stable-dfde3147c6a705b663175c0545efc34929a55ee5.tar.gz linux-stable-dfde3147c6a705b663175c0545efc34929a55ee5.tar.bz2 linux-stable-dfde3147c6a705b663175c0545efc34929a55ee5.zip | |
Bluetooth: Fix memory leak in hci_connect_le_scan
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>
| -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 f5c27065ad44..db735d0d931e 100644 --- a/net/bluetooth/hci_conn.c +++ b/net/bluetooth/hci_conn.c @@ -1173,8 +1173,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); |