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

Commit 80c1a2e7 authored by Johan Hedberg's avatar Johan Hedberg Committed by Marcel Holtmann
Browse files

Bluetooth: Reject invalid bdaddr types for sockets 



We need to verify that the bdaddr type passed to connect() and bind() is
within the set of valid values. If it is not we need to cleanly fail
with EINVAL.

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

net/bluetooth/l2cap_sock.c

+6 −0
Original line number Diff line number Diff line
@@ -69,6 +69,9 @@ static int l2cap_sock_bind(struct socket *sock, struct sockaddr *addr, int alen) 
	if (la.l2_cid && la.l2_psm)

		return -EINVAL;



	if (!bdaddr_type_is_valid(la.l2_bdaddr_type))

		return -EINVAL;



	lock_sock(sk);



	if (sk->sk_state != BT_OPEN) {
@@ -144,6 +147,9 @@ static int l2cap_sock_connect(struct socket *sock, struct sockaddr *addr, 
	if (la.l2_cid && la.l2_psm)

		return -EINVAL;



	if (!bdaddr_type_is_valid(la.l2_bdaddr_type))

		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)