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

Commit 3e64b7bd authored by Johan Hedberg's avatar Johan Hedberg Committed by Marcel Holtmann
Browse files

Bluetooth: Trigger SMP for the appropriate LE CoC errors 



The insufficient authentication/encryption errors indicate to the L2CAP
client that it should try to elevate the security level. Since there
really isn't any exception to this rule it makes sense to fully handle
it on the kernel side instead of pushing the responsibility to user
space.

This patch adds special handling of these two error codes and calls
smp_conn_security() with the elevated security level if necessary.

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

net/bluetooth/l2cap_core.c

+22 −1
Original line number Diff line number Diff line
@@ -5218,9 +5218,10 @@ static int l2cap_le_connect_rsp(struct l2cap_conn *conn, 
				u8 *data)

{

	struct l2cap_le_conn_rsp *rsp = (struct l2cap_le_conn_rsp *) data;

	struct hci_conn *hcon = conn->hcon;

	u16 dcid, mtu, mps, credits, result;

	struct l2cap_chan *chan;

	int err;

	int err, sec_level;



	if (cmd_len < sizeof(*rsp))

		return -EPROTO;
@@ -5259,6 +5260,26 @@ static int l2cap_le_connect_rsp(struct l2cap_conn *conn, 
		l2cap_chan_ready(chan);

		break;



	case L2CAP_CR_AUTHENTICATION:

	case L2CAP_CR_ENCRYPTION:

		/* If we already have MITM protection we can't do

		 * anything.

		 */

		if (hcon->sec_level > BT_SECURITY_MEDIUM) {

			l2cap_chan_del(chan, ECONNREFUSED);

			break;

		}



		sec_level = hcon->sec_level + 1;

		if (chan->sec_level < sec_level)

			chan->sec_level = sec_level;



		/* We'll need to send a new Connect Request */

		clear_bit(FLAG_LE_CONN_REQ_SENT, &chan->flags);



		smp_conn_security(hcon, chan->sec_level);

		break;



	default:

		l2cap_chan_del(chan, ECONNREFUSED);

		break;