Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a7889cc authored by Johan Hedberg's avatar Johan Hedberg Committed by Marcel Holtmann
Browse files

Bluetooth: L2CAP: Fix returning correct LE CoC response codes 



The core spec defines specific response codes for situations when the
received CID is incorrect. Add the defines for these and return them
as appropriate from the LE Connect Request handler function.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 2ab216a7

include/net/bluetooth/l2cap.h

+2 −0
Original line number Diff line number Diff line
@@ -275,6 +275,8 @@ struct l2cap_conn_rsp { 
#define L2CAP_CR_AUTHORIZATION	0x0006

#define L2CAP_CR_BAD_KEY_SIZE	0x0007

#define L2CAP_CR_ENCRYPTION	0x0008

#define L2CAP_CR_INVALID_SCID	0x0009

#define L2CAP_CR_SCID_IN_USE	0x0010



/* connect/create channel status */

#define L2CAP_CS_NO_INFO	0x0000

net/bluetooth/l2cap_core.c

+8 −1
Original line number Diff line number Diff line
@@ -5437,9 +5437,16 @@ static int l2cap_le_connect_req(struct l2cap_conn *conn, 
		goto response_unlock;

	}



	/* Check for valid dynamic CID range */

	if (scid < L2CAP_CID_DYN_START || scid > L2CAP_CID_LE_DYN_END) {

		result = L2CAP_CR_INVALID_SCID;

		chan = NULL;

		goto response_unlock;

	}



	/* Check if we already have channel with that dcid */

	if (__l2cap_get_chan_by_dcid(conn, scid)) {

		result = L2CAP_CR_NO_MEM;

		result = L2CAP_CR_SCID_IN_USE;

		chan = NULL;

		goto response_unlock;

	}