From b86b0b150fed840c376145383ef5105116c81b0c Mon Sep 17 00:00:00 2001

From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

Date: Fri, 27 Mar 2020 11:32:14 -0700

Subject: [PATCH] Bluetooth: L2CAP: Fix handling LE modes by L2CAP_OPTIONS

Git-commit: b86b0b150fed840c376145383ef5105116c81b0c

References: git-fixes

Patch-mainline: v5.8-rc1

L2CAP_OPTIONS shall only be used with BR/EDR modes.

Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

Signed-off-by: Oliver Neukum <oneukum@suse.com>

---

 net/bluetooth/l2cap_sock.c |   25 +++++++++++++++++++++----

 1 file changed, 21 insertions(+), 4 deletions(-)

--- a/net/bluetooth/l2cap_sock.c

+++ b/net/bluetooth/l2cap_sock.c

@@ -418,6 +418,20 @@ static int l2cap_sock_getsockopt_old(str

 			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;

@@ -677,10 +691,8 @@ static int l2cap_sock_setsockopt_old(str

 			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;

@@ -694,6 +706,11 @@ static int l2cap_sock_setsockopt_old(str

 			break;

 		}

+		if (err < 0)

+			break;

+

+		chan->mode = opts.mode;

+

 		chan->imtu = opts.imtu;

 		chan->omtu = opts.omtu;

 		chan->fcs  = opts.fcs;