Bluetooth: Check address in mgmt_disconnect_failed()
Check the address and address type in mgmt_disconnect_failed() otherwise we may wrongly fail the MGMT_OP_DISCONNECT command. Signed-off-by: Andre Guedes <andre.guedes@openbossa.org> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
parent
8a4934f1d6
commit
3655bba8fe
|
@ -4613,6 +4613,8 @@ void mgmt_device_disconnected(struct hci_dev *hdev, bdaddr_t *bdaddr,
|
||||||
void mgmt_disconnect_failed(struct hci_dev *hdev, bdaddr_t *bdaddr,
|
void mgmt_disconnect_failed(struct hci_dev *hdev, bdaddr_t *bdaddr,
|
||||||
u8 link_type, u8 addr_type, u8 status)
|
u8 link_type, u8 addr_type, u8 status)
|
||||||
{
|
{
|
||||||
|
u8 bdaddr_type = link_to_bdaddr(link_type, addr_type);
|
||||||
|
struct mgmt_cp_disconnect *cp;
|
||||||
struct mgmt_rp_disconnect rp;
|
struct mgmt_rp_disconnect rp;
|
||||||
struct pending_cmd *cmd;
|
struct pending_cmd *cmd;
|
||||||
|
|
||||||
|
@ -4623,8 +4625,16 @@ void mgmt_disconnect_failed(struct hci_dev *hdev, bdaddr_t *bdaddr,
|
||||||
if (!cmd)
|
if (!cmd)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
cp = cmd->param;
|
||||||
|
|
||||||
|
if (bacmp(bdaddr, &cp->addr.bdaddr))
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (cp->addr.type != bdaddr_type)
|
||||||
|
return;
|
||||||
|
|
||||||
bacpy(&rp.addr.bdaddr, bdaddr);
|
bacpy(&rp.addr.bdaddr, bdaddr);
|
||||||
rp.addr.type = link_to_bdaddr(link_type, addr_type);
|
rp.addr.type = bdaddr_type;
|
||||||
|
|
||||||
cmd_complete(cmd->sk, cmd->index, MGMT_OP_DISCONNECT,
|
cmd_complete(cmd->sk, cmd->index, MGMT_OP_DISCONNECT,
|
||||||
mgmt_status(status), &rp, sizeof(rp));
|
mgmt_status(status), &rp, sizeof(rp));
|
||||||
|
|
Loading…
Reference in a new issue