Bluetooth: L2CAP: Fix leaking l2cap_conn objects
Subsystems (2)
Luiz Augusto von Dentz
maintainerPATCH v2 1/1 Bluetooth: L2CAP: Fix leaking l2cap_conn objects
From: Luiz Augusto von Dentz <[email protected]>
l2cap_conn objects must be cleanup whenever its hci_chan is deleted by hci_chan_list_flush since it means the connection attempt is being aborted prematurely thus no calls to connect_cfm/disconnect_cfm would be generated causing the l2cap_conn object to leak.
--- include/net/bluetooth/hci_core.h | 2 ++ net/bluetooth/hci_conn.c | 4 ++++ net/bluetooth/l2cap_core.c | 29 ++++++++++++++++++++++++++--- 3 files changed, 32 insertions(+), 3 deletions(-)
include/net/bluetooth/hci_core.h +2 -0
@@ -795,6 +795,8 @@ struct hci_chan {unsigned int sent;__u8 state;bool amp; + +void (*cleanup)(struct hci_chan *chan); };struct hci_conn_params {
net/bluetooth/hci_conn.c +4 -0
@@ -2746,6 +2746,10 @@ void hci_chan_del(struct hci_chan *chan)/* Prevent new hci_chan's to be created for this hci_conn */ set_bit (HCI_CONN_DROP , &conn->flags); +if (chan->cleanup) + chan->cleanup (chan); + + chan->conn =NULL ;hci_conn_put (conn);skb_queue_purge (&chan->data_q);
net/bluetooth/l2cap_core.c +26 -3
@@ -1896,6 +1896,8 @@ static void l2cap_conn_del(struct hci_conn *hcon, int err)BT_DBG ("hcon %p conn %p, err %d" , hcon, conn, err); + hcon->l2cap_data =NULL ; +kfree_skb (conn->rx_skb);skb_queue_purge (&conn->pending_rx);
@@ -1931,13 +1933,15 @@ static void l2cap_conn_del(struct hci_conn *hcon, int err)mutex_unlock (&conn->chan_lock); -hci_chan_del (conn->hchan); +if (conn->hchan) { + conn->hchan->cleanup =NULL ; +hci_chan_del (conn->hchan); + conn->hchan =NULL ; + }if (conn->info_state &L2CAP_INFO_FEAT_MASK_REQ_SENT )cancel_delayed_work_sync (&conn->info_timer); - hcon->l2cap_data =NULL ; - conn->hchan =NULL ;l2cap_conn_put (conn); }
@@ -7830,6 +7834,24 @@ static void process_pending_rx(struct work_struct *work)l2cap_recv_frame (conn, skb); } +static void l2cap_conn_hchan_cleanup (struct hci_chan *hchan) +{ +struct hci_conn *hcon = hchan->conn; +struct l2cap_conn *conn; + +if (!hcon) +return ; + + conn = hcon->l2cap_data; +if (!conn) +return ; + +/* hci_chan_del has been called so we shouldn't call it gain. */ + conn->hchan =NULL ; + +l2cap_conn_del (hcon,bt_to_errno (HCI_ERROR_LOCAL_HOST_TERM )); +} +static struct l2cap_conn *l2cap_conn_add (struct hci_conn *hcon) {struct l2cap_conn *conn = hcon->l2cap_data;
@@ -7852,6 +7874,7 @@ static struct l2cap_conn *l2cap_conn_add(struct hci_conn *hcon) hcon->l2cap_data = conn; conn->hcon =hci_conn_get (hcon); conn->hchan = hchan; + hchan->cleanup = l2cap_conn_hchan_cleanup;BT_DBG ("hcon %p conn %p hchan %p" , hcon, conn, hchan);
Signature · 1 line
2.41.0
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=784341
---Test result---
Test Summary:
CheckPatch FAIL 1.43 seconds GitLint PASS 0.36 seconds SubjectPrefix PASS 0.14 seconds BuildKernel PASS 35.73 seconds CheckAllWarning PASS 38.72 seconds CheckSparse PASS 44.91 seconds CheckSmatch PASS 117.19 seconds BuildKernel32 PASS 34.18 seconds TestRunnerSetup PASS 511.69 seconds TestRunner_l2cap-tester PASS 27.94 seconds TestRunner_iso-tester PASS 54.37 seconds TestRunner_bnep-tester PASS 10.71 seconds TestRunner_mgmt-tester PASS 222.67 seconds TestRunner_rfcomm-tester PASS 16.36 seconds TestRunner_sco-tester PASS 19.56 seconds TestRunner_ioctl-tester PASS 18.24 seconds TestRunner_mesh-tester PASS 13.59 seconds TestRunner_smp-tester PASS 14.56 seconds TestRunner_userchan-tester PASS 11.23 seconds IncrementalBuild PASS 34.88 seconds
Details
##############################
Test: CheckPatch - FAIL
Desc: Run checkpatch.pl script
Output:
[v2] Bluetooth: L2CAP: Fix leaking l2cap_conn objects
WARNING: Reported-by: should be immediately followed by Closes: with a URL to the report #88:
total: 0 errors, 1 warnings, 0 checks, 75 lines checked
NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or --fix-inplace.
/github/workspace/src/src/13386049.patch has style problems, please review.
NOTE: Ignored message types: UNKNOWN_COMMIT_ID
NOTE: If any of the errors are false positives, please report
them to the maintainer, see CHECKPATCH in MAINTAINERS.
---
Regards,
Linux Bluetooth