Bluetooth: AMP contollers do not support the legacy ioctls (5b69bef5) · Commits · 戴 / test

The legacy ioctls for device specific commands including inquiry are not support by AMP controllers. So just reject them right away instead of trying to send the HCI command and wait for failure from the actual hardware. Signed-off-by:

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

Johan Hedberg <johan.hedberg@intel.com>

net/bluetooth/hci_core.c

+10 −0

Original line number	Diff line number	Diff line
		@@ -1048,6 +1048,11 @@ int hci_inquiry(void __user *arg)
		goto done;
		}

		if (hdev->dev_type != HCI_BREDR) {
		err = -EOPNOTSUPP;
		goto done;
		}

		if (!test_bit(HCI_BREDR_ENABLED, &hdev->dev_flags)) {
		err = -EOPNOTSUPP;
		goto done;
		@@ -1533,6 +1538,11 @@ int hci_dev_cmd(unsigned int cmd, void __user *arg)
		goto done;
		}

		if (hdev->dev_type != HCI_BREDR) {
		err = -EOPNOTSUPP;
		goto done;
		}

		if (!test_bit(HCI_BREDR_ENABLED, &hdev->dev_flags)) {
		err = -EOPNOTSUPP;
		goto done;

net/bluetooth/hci_sock.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -518,6 +518,9 @@ static int hci_sock_bound_ioctl(struct sock *sk, unsigned int cmd,
		if (test_bit(HCI_USER_CHANNEL, &hdev->dev_flags))
		return -EBUSY;

		if (hdev->dev_type != HCI_BREDR)
		return -EOPNOTSUPP;

		switch (cmd) {
		case HCISETRAW:
		if (!capable(CAP_NET_ADMIN))

Admin message