Bluetooth: check for already existent channel before create new one (2dfa1003) · Commits · 戴 / test

Move this check to before the channel time creation simplifies the code and avoid memory allocation if the channel already exist. Signed-off-by:

net/bluetooth/l2cap_core.c

+4 −9

Original line number	Diff line number	Diff line
		@@ -3343,21 +3343,16 @@ static inline int l2cap_connect_req(struct l2cap_conn *conn, struct l2cap_cmd_hd

		result = L2CAP_CR_NO_MEM;

		/* Check if we already have channel with that dcid */
		if (__l2cap_get_chan_by_dcid(conn, scid))
		goto response;

		chan = pchan->ops->new_connection(pchan);
		if (!chan)
		goto response;

		sk = chan->sk;

		/* Check if we already have channel with that dcid */
		if (__l2cap_get_chan_by_dcid(conn, scid)) {
		if (chan->ops->teardown)
		chan->ops->teardown(chan, 0);

		chan->ops->close(chan);
		goto response;
		}

		hci_conn_hold(conn->hcon);

		bacpy(&bt_sk(sk)->src, conn->src);