Bluetooth: Fix response on confirm_name (d3a2541d) · Commits · 戴 / test

According to mgmt-api.txt, in case of confirm name command, cmd_complete should be always use as a response. Not command status as it is now for failures. Using command complete on failure is actually better as client might be interested in device address for which confirm name failed. Signed-off-by:

Lukasz Rymanowski <lukasz.rymanowski@tieto.com> Signed-off-by:

Marcel Holtmann <marcel@holtmann.org>

net/bluetooth/mgmt.c

+6 −4

Original line number	Diff line number	Diff line
		@@ -3627,15 +3627,17 @@ static int confirm_name(struct sock sk, struct hci_dev hdev, void *data,
		hci_dev_lock(hdev);

		if (!hci_discovery_active(hdev)) {
		err = cmd_status(sk, hdev->id, MGMT_OP_CONFIRM_NAME,
		MGMT_STATUS_FAILED);
		err = cmd_complete(sk, hdev->id, MGMT_OP_CONFIRM_NAME,
		MGMT_STATUS_FAILED, &cp->addr,
		sizeof(cp->addr));
		goto failed;
		}

		e = hci_inquiry_cache_lookup_unknown(hdev, &cp->addr.bdaddr);
		if (!e) {
		err = cmd_status(sk, hdev->id, MGMT_OP_CONFIRM_NAME,
		MGMT_STATUS_INVALID_PARAMS);
		err = cmd_complete(sk, hdev->id, MGMT_OP_CONFIRM_NAME,
		MGMT_STATUS_INVALID_PARAMS, &cp->addr,
		sizeof(cp->addr));
		goto failed;
		}

Admin message