| From f41b65c7ed0c1734731c40a8e7aaf560e70ca50c Mon Sep 17 00:00:00 2001 |
| From: Navid Emamdoost <navid.emamdoost@gmail.com> |
| Date: Thu, 21 Nov 2019 14:20:36 -0600 |
| Subject: [PATCH] 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: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| 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); |
| -- |
| 2.7.4 |
| |