Commit 6c2ea7a8 authored by Gustavo Padovan's avatar Gustavo Padovan Committed by Marcel Holtmann
Browse files

Bluetooth: Refuse ConfigRsp with different mode 



If our mode is Basic Mode we have to refuse any ConfigRsp that proposes
a different mode.

Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 62547752

net/bluetooth/l2cap.c

+5 −1
Original line number Diff line number Diff line
@@ -2747,7 +2747,6 @@ static int l2cap_parse_conf_rsp(struct sock *sk, void *rsp, int len, void *data, 
							rfc.mode != pi->mode)

				return -ECONNREFUSED;



			pi->mode = rfc.mode;

			pi->fcs = 0;



			l2cap_add_conf_opt(&ptr, L2CAP_CONF_RFC,
@@ -2756,6 +2755,11 @@ static int l2cap_parse_conf_rsp(struct sock *sk, void *rsp, int len, void *data, 
		}

	}



	if (pi->mode == L2CAP_MODE_BASIC && pi->mode != rfc.mode)

		return -ECONNREFUSED;



	pi->mode = rfc.mode;



	if (*result == L2CAP_CONF_SUCCESS) {

		switch (rfc.mode) {

		case L2CAP_MODE_ERTM: