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

Commit 9d4b68b2 authored by Marcel Holtmann's avatar Marcel Holtmann Committed by Gustavo Padovan
Browse files

Bluetooth: Fix handling of getsockname() for HCI sockets 



The hci_dev check is not protected and so move it into the socket lock. In
addition return the HCI channel identifier instead of always 0 channel.

Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent 06f43cbc

net/bluetooth/hci_sock.c

+11 −6
Original line number Diff line number Diff line
@@ -695,25 +695,30 @@ static int hci_sock_getname(struct socket *sock, struct sockaddr *addr, 
{

	struct sockaddr_hci *haddr = (struct sockaddr_hci *) addr;

	struct sock *sk = sock->sk;

	struct hci_dev *hdev = hci_pi(sk)->hdev;

	struct hci_dev *hdev;

	int err = 0;



	BT_DBG("sock %p sk %p", sock, sk);



	if (peer)

		return -EOPNOTSUPP;



	if (!hdev)

		return -EBADFD;



	lock_sock(sk);



	hdev = hci_pi(sk)->hdev;

	if (!hdev) {

		err = -EBADFD;

		goto done;

	}



	*addr_len = sizeof(*haddr);

	haddr->hci_family = AF_BLUETOOTH;

	haddr->hci_dev    = hdev->id;

	haddr->hci_channel= 0;

	haddr->hci_channel= hci_pi(sk)->channel;



done:

	release_sock(sk);

	return 0;

	return err;

}



static void hci_sock_cmsg(struct sock *sk, struct msghdr *msg,