diff options
| author |   Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2022-04-22 12:58:17 -0700 |
|---|---|---|
| committer |   Marcel Holtmann <marcel@holtmann.org> | 2022-04-26 20:10:22 +0200 |
| commit | aef2aa4fa98e18ea5d9345bf777ee698c8598728 (patch) | |
| tree | 82ba16c5657ec9358a39acf11607cef051ba2b96 /net | |
| parent | Bluetooth: hci_event: Fix checking for invalid handle on error status (diff) | |
| download | linux-dev-aef2aa4fa98e18ea5d9345bf777ee698c8598728.tar.xz linux-dev-aef2aa4fa98e18ea5d9345bf777ee698c8598728.zip | |
Bluetooth: hci_event: Fix creating hci_conn object on error status
It is useless to create a hci_conn object if on error status as the
result would be it being freed in the process and anyway it is likely
the result of controller and host stack being out of sync.
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/bluetooth/hci_event.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 3a9071b987f4..5a6c8afc51a0 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -3075,6 +3075,12 @@ static void hci_conn_complete_evt(struct hci_dev *hdev, void *data, conn = hci_conn_hash_lookup_ba(hdev, ev->link_type, &ev->bdaddr); if (!conn) { + /* In case of error status and there is no connection pending + * just unlock as there is nothing to cleanup. + */ + if (ev->status) + goto unlock; + /* Connection may not exist if auto-connected. Check the bredr * allowlist to see if this device is allowed to auto connect. * If link is an ACL type, create a connection class @@ -5542,6 +5548,12 @@ static void le_conn_complete_evt(struct hci_dev *hdev, u8 status, conn = hci_lookup_le_connect(hdev); if (!conn) { + /* In case of error status and there is no connection pending + * just unlock as there is nothing to cleanup. + */ + if (status) + goto unlock; + conn = hci_conn_add(hdev, LE_LINK, bdaddr, role); if (!conn) { bt_dev_err(hdev, "no memory for new connection"); |