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

Commit 387a33e3 authored by Johan Hedberg's avatar Johan Hedberg Committed by Marcel Holtmann
Browse files

Bluetooth: Fix updating Identity Address in L2CAP channels 



When we receive a remote identity address during SMP key distribution we
should ensure that any associated L2CAP channel instances get their
address information correspondingly updated (so that e.g. doing
getpeername on associated sockets returns the correct address).

This patch adds a new L2CAP core function l2cap_conn_update_id_addr()
which is used to iterate through all L2CAP channels associated with a
connection and update their address information.

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

include/net/bluetooth/l2cap.h

+1 −0
Original line number Diff line number Diff line
@@ -881,6 +881,7 @@ int l2cap_ertm_init(struct l2cap_chan *chan); 
void l2cap_chan_add(struct l2cap_conn *conn, struct l2cap_chan *chan);

void __l2cap_chan_add(struct l2cap_conn *conn, struct l2cap_chan *chan);

void l2cap_chan_del(struct l2cap_chan *chan, int err);

void l2cap_conn_update_id_addr(struct hci_conn *hcon);

void l2cap_send_conn_req(struct l2cap_chan *chan);

void l2cap_move_start(struct l2cap_chan *chan);

void l2cap_logical_cfm(struct l2cap_chan *chan, struct hci_chan *hchan,

net/bluetooth/l2cap_core.c

+17 −0
Original line number Diff line number Diff line
@@ -609,6 +609,23 @@ void l2cap_chan_del(struct l2cap_chan *chan, int err) 
	return;

}



void l2cap_conn_update_id_addr(struct hci_conn *hcon)

{

	struct l2cap_conn *conn = hcon->l2cap_data;

	struct l2cap_chan *chan;



	mutex_lock(&conn->chan_lock);



	list_for_each_entry(chan, &conn->chan_l, list) {

		l2cap_chan_lock(chan);

		bacpy(&chan->dst, &hcon->dst);

		chan->dst_type = bdaddr_type(hcon, hcon->dst_type);

		l2cap_chan_unlock(chan);

	}



	mutex_unlock(&conn->chan_lock);

}



static void l2cap_chan_le_connect_reject(struct l2cap_chan *chan)

{

	struct l2cap_conn *conn = chan->conn;

net/bluetooth/smp.c

+2 −0
Original line number Diff line number Diff line
@@ -991,6 +991,8 @@ static int smp_cmd_ident_addr_info(struct l2cap_conn *conn, 
	bacpy(&hcon->dst, &smp->id_addr);

	hcon->dst_type = smp->id_addr_type;



	l2cap_conn_update_id_addr(hcon);



	smp_distribute_keys(conn, 1);



	return 0;