Bluetooth: hci_conn: Reduce hci_conn_drop() calls in two functions
Subsystems (2)
PATCH 1/1 Bluetooth: hci_conn: Reduce hci_conn_drop() calls in two functions
From: Markus Elfring <[email protected]>
Date: Tue, 1 Oct 2024 09:21:25 +0200
An hci_conn_drop() call was immediately used after a null pointer check for an hci_conn_link() call in two function implementations. Thus call such a function only once instead directly before the checks.
This issue was transformed by using the Coccinelle software.
Signed-off-by Markus Elfring <[email protected]>
--- net/bluetooth/hci_conn.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-)
net/bluetooth/hci_conn.c +3 -10
@@ -2221,13 +2221,9 @@ struct hci_conn *hci_bind_bis(struct hci_dev *hdev, bdaddr_t *dst, conn->iso_qos.bcast.big);if (parent && parent != conn) { link =hci_conn_link (parent, conn); -if (!link) { -hci_conn_drop (conn); -return ERR_PTR (-ENOLINK ); - } - -/* Link takes the refcount */ hci_conn_drop (conn); +if (!link) +return ERR_PTR (-ENOLINK ); }return conn;
@@ -2317,15 +2313,12 @@ struct hci_conn *hci_connect_cis(struct hci_dev *hdev, bdaddr_t *dst, } link =hci_conn_link (le, cis); +hci_conn_drop (cis);if (!link) {hci_conn_drop (le); -hci_conn_drop (cis);return ERR_PTR (-ENOLINK ); } -/* Link takes the refcount */ -hci_conn_drop (cis); - cis->state =BT_CONNECT ;hci_le_create_cis_pending (hdev);
--
2.46.1