Bluetooth: Restrict ioctls to HCI raw channel sockets (c1c4f956) · Commits · 戴 / test

The various legacy ioctls used with HCI sockets are limited to raw channel only. They are not used on the other channels and also have no meaning there. So return an error if tried to use them. Signed-off-by:

Marcel Holtmann <marcel@holtmann.org> Signed-off-by:

Gustavo Padovan <gustavo.padovan@collabora.co.uk>

net/bluetooth/hci_sock.c

+17 −6

Original line number	Diff line number	Diff line
		@@ -547,6 +547,15 @@ static int hci_sock_ioctl(struct socket *sock, unsigned int cmd,

		BT_DBG("cmd %x arg %lx", cmd, arg);

		lock_sock(sk);

		if (hci_pi(sk)->channel != HCI_CHANNEL_RAW) {
		err = -EBADFD;
		goto done;
		}

		release_sock(sk);

		switch (cmd) {
		case HCIGETDEVLIST:
		return hci_get_dev_list(argp);
		@@ -591,14 +600,16 @@ static int hci_sock_ioctl(struct socket *sock, unsigned int cmd,

		case HCIINQUIRY:
		return hci_inquiry(argp);
		}

		default:
		lock_sock(sk);

		err = hci_sock_bound_ioctl(sk, cmd, arg);

		done:
		release_sock(sk);
		return err;
		}
		}

		static int hci_sock_bind(struct socket sock, struct sockaddr addr,
		int addr_len)

Admin message