提交 feb94d3d 编写于 作者: J Johan Hedberg 提交者: Gustavo Padovan

Bluetooth: Fix PIN/Confirm/Passkey response parameters

The only valid mgmt response to these pairing related commands is a
mgmt_cmd_complete and the returned parameters should contain the address
and address type of the remote device.
Signed-off-by: NJohan Hedberg <johan.hedberg@intel.com>
Acked-by: NMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: NGustavo Padovan <gustavo.padovan@collabora.co.uk>
上级 1707c60e
...@@ -2310,8 +2310,9 @@ static int user_pairing_resp(struct sock *sk, struct hci_dev *hdev, ...@@ -2310,8 +2310,9 @@ static int user_pairing_resp(struct sock *sk, struct hci_dev *hdev,
hci_dev_lock(hdev); hci_dev_lock(hdev);
if (!hdev_is_powered(hdev)) { if (!hdev_is_powered(hdev)) {
err = cmd_status(sk, hdev->id, mgmt_op, err = cmd_complete(sk, hdev->id, mgmt_op,
MGMT_STATUS_NOT_POWERED); MGMT_STATUS_NOT_POWERED, addr,
sizeof(*addr));
goto done; goto done;
} }
...@@ -2321,8 +2322,9 @@ static int user_pairing_resp(struct sock *sk, struct hci_dev *hdev, ...@@ -2321,8 +2322,9 @@ static int user_pairing_resp(struct sock *sk, struct hci_dev *hdev,
conn = hci_conn_hash_lookup_ba(hdev, LE_LINK, &addr->bdaddr); conn = hci_conn_hash_lookup_ba(hdev, LE_LINK, &addr->bdaddr);
if (!conn) { if (!conn) {
err = cmd_status(sk, hdev->id, mgmt_op, err = cmd_complete(sk, hdev->id, mgmt_op,
MGMT_STATUS_NOT_CONNECTED); MGMT_STATUS_NOT_CONNECTED, addr,
sizeof(*addr));
goto done; goto done;
} }
...@@ -2331,11 +2333,13 @@ static int user_pairing_resp(struct sock *sk, struct hci_dev *hdev, ...@@ -2331,11 +2333,13 @@ static int user_pairing_resp(struct sock *sk, struct hci_dev *hdev,
err = smp_user_confirm_reply(conn, mgmt_op, passkey); err = smp_user_confirm_reply(conn, mgmt_op, passkey);
if (!err) if (!err)
err = cmd_status(sk, hdev->id, mgmt_op, err = cmd_complete(sk, hdev->id, mgmt_op,
MGMT_STATUS_SUCCESS); MGMT_STATUS_SUCCESS, addr,
sizeof(*addr));
else else
err = cmd_status(sk, hdev->id, mgmt_op, err = cmd_complete(sk, hdev->id, mgmt_op,
MGMT_STATUS_FAILED); MGMT_STATUS_FAILED, addr,
sizeof(*addr));
goto done; goto done;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册