Commit 69d67b46 authored May 04, 2020 by Konstantin Forostyan Committed by Marcel Holtmann May 11, 2020

Bluetooth: L2CAP: Fix errors during L2CAP_CREDIT_BASED_CONNECTION_REQ (0x17)



Fix 2 typos in L2CAP_CREDIT_BASED_CONNECTION_REQ (0x17) handling function, that
cause BlueZ answer with L2CAP_CR_LE_INVALID_PARAMS or L2CAP_CR_LE_INVALID_SCID
error on a correct ECRED connection request.

Enchanced Credit Based Mode support was recently introduced with the commit
15f02b91 ("Bluetooth: L2CAP: Add initial code
for Enhanced Credit Based Mode").

Signed-off-by: Konstantin Forostyan <konstantin.forostyan@peiker-cee.de>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

parent eaa7b722

net/bluetooth/l2cap_core.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -5927,7 +5927,7 @@ static inline int l2cap_ecred_conn_req(struct l2cap_conn *conn,
		if (!enable_ecred)
		return -EINVAL;

		if (cmd_len < sizeof(req) \|\| cmd_len - sizeof(req) % sizeof(u16)) {
		if (cmd_len < sizeof(req) \|\| (cmd_len - sizeof(req)) % sizeof(u16)) {
		result = L2CAP_CR_LE_INVALID_PARAMS;
		goto response;
		}
		@@ -5964,7 +5964,7 @@ static inline int l2cap_ecred_conn_req(struct l2cap_conn *conn,
		}

		result = L2CAP_CR_LE_SUCCESS;
		cmd_len -= sizeof(req);
		cmd_len -= sizeof(*req);
		num_scid = cmd_len / sizeof(u16);

		for (i = 0; i < num_scid; i++) {

Admin message