Commit 118da70b authored Jan 20, 2013 by Johan Hedberg Committed by Gustavo Padovan Jan 23, 2013

Bluetooth: Fix checking for valid disconnect parameters in unpair_device



The valid values for the Disconnect parameter in the Unpair Device
command are 0x00 and 0x01. If any other value is encountered the command
should fail with the appropriate invalid params response.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>

parent 4ee71b20

net/bluetooth/mgmt.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -1590,6 +1590,11 @@ static int unpair_device(struct sock sk, struct hci_dev hdev, void *data,
		MGMT_STATUS_INVALID_PARAMS,
		&rp, sizeof(rp));

		if (cp->disconnect != 0x00 && cp->disconnect != 0x01)
		return cmd_complete(sk, hdev->id, MGMT_OP_UNPAIR_DEVICE,
		MGMT_STATUS_INVALID_PARAMS,
		&rp, sizeof(rp));

		hci_dev_lock(hdev);

		if (!hdev_is_powered(hdev)) {

Admin message