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

Commit 1f209383 authored by Johan Hedberg's avatar Johan Hedberg Committed by Marcel Holtmann
Browse files

Bluetooth: Check that bind() bdaddr type matches connect() 



If a socket was bound to an address type other than BR/EDR (such as LE)
we should reject trying to connect it to a BR/EDR address. The same
applies for binding to BR/EDR and trying to connect to non-BR/EDR.

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

net/bluetooth/l2cap_sock.c

+6 −0
Original line number Diff line number Diff line
@@ -150,6 +150,12 @@ static int l2cap_sock_connect(struct socket *sock, struct sockaddr *addr, 
	if (!bdaddr_type_is_valid(la.l2_bdaddr_type))

		return -EINVAL;



	if (chan->src_type == BDADDR_BREDR && la.l2_bdaddr_type != BDADDR_BREDR)

		return -EINVAL;



	if (chan->src_type != BDADDR_BREDR && la.l2_bdaddr_type == BDADDR_BREDR)

		return -EINVAL;



	err = l2cap_chan_connect(chan, la.l2_psm, __le16_to_cpu(la.l2_cid),

				 &la.l2_bdaddr, la.l2_bdaddr_type);

	if (err)