Commit b86b0b15 authored by Luiz Augusto von Dentz's avatar Luiz Augusto von Dentz Committed by Marcel Holtmann
Browse files

Bluetooth: L2CAP: Fix handling LE modes by L2CAP_OPTIONS 



L2CAP_OPTIONS shall only be used with BR/EDR modes.

Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 139dfad6

net/bluetooth/l2cap_sock.c

+21 −4
Original line number Diff line number Diff line
@@ -424,6 +424,20 @@ static int l2cap_sock_getsockopt_old(struct socket *sock, int optname, 
			break;

		}



		/* Only BR/EDR modes are supported here */

		switch (chan->mode) {

		case L2CAP_MODE_BASIC:

		case L2CAP_MODE_ERTM:

		case L2CAP_MODE_STREAMING:

			break;

		default:

			err = -EINVAL;

			break;

		}



		if (err < 0)

			break;



		memset(&opts, 0, sizeof(opts));

		opts.imtu     = chan->imtu;

		opts.omtu     = chan->omtu;
@@ -698,10 +712,8 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname, 
			break;

		}



		chan->mode = opts.mode;

		switch (chan->mode) {

		case L2CAP_MODE_LE_FLOWCTL:

			break;

		/* Only BR/EDR modes are supported here */

		switch (opts.mode) {

		case L2CAP_MODE_BASIC:

			clear_bit(CONF_STATE2_DEVICE, &chan->conf_state);

			break;
@@ -715,6 +727,11 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname, 
			break;

		}



		if (err < 0)

			break;



		chan->mode = opts.mode;



		BT_DBG("mode 0x%2.2x", chan->mode);



		chan->imtu = opts.imtu;