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

Commit 160dc6ac authored by Vinicius Costa Gomes's avatar Vinicius Costa Gomes Committed by Gustavo Padovan
Browse files

Bluetooth: Add support for running SMP without a socket 



When doing the pairing procedure we won't have an associated
socket, but we still have to do the SMP negotiation. This
adds support for encrypting the link and exchanging keys.

Signed-off-by: default avatarVinicius Costa Gomes <vinicius.gomes@openbossa.org>
Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
parent 7a512d01

net/bluetooth/l2cap_core.c

+8 −2
Original line number Diff line number Diff line
@@ -907,6 +907,9 @@ static void l2cap_conn_ready(struct l2cap_conn *conn) 
	if (!conn->hcon->out && conn->hcon->type == LE_LINK)

		l2cap_le_conn_ready(conn);



	if (conn->hcon->out && conn->hcon->type == LE_LINK)

		smp_conn_security(conn, conn->hcon->pending_sec_level);



	read_lock(&conn->chan_lock);



	list_for_each_entry(chan, &conn->chan_l, list) {
@@ -4095,6 +4098,11 @@ static int l2cap_security_cfm(struct hci_conn *hcon, u8 status, u8 encrypt) 


	BT_DBG("conn %p", conn);



	if (hcon->type == LE_LINK) {

		smp_distribute_keys(conn, 0);

		del_timer(&conn->security_timer);

	}



	read_lock(&conn->chan_lock);



	list_for_each_entry(chan, &conn->chan_l, list) {
@@ -4107,9 +4115,7 @@ static int l2cap_security_cfm(struct hci_conn *hcon, u8 status, u8 encrypt) 
		if (chan->scid == L2CAP_CID_LE_DATA) {

			if (!status && encrypt) {

				chan->sec_level = hcon->sec_level;

				del_timer(&conn->security_timer);

				l2cap_chan_ready(sk);

				smp_distribute_keys(conn, 0);

			}



			bh_unlock_sock(sk);