dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

Bluetooth: mgmt: Fix OOB command response parameters 

The response to the Add/Remove Out Of Band Data commands should include
the same address as was given in the command itself.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Johan Hedberg 2012-02-19 13:16:14 +02:00
parent f0eeea8b61
commit bf1e3541f7
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
net/bluetooth/mgmt.c
View File

@ -2094,6 +2094,7 @@ static int add_remote_oob_data(struct sock *sk, u16 index, void *data,
{
struct hci_dev *hdev;
struct mgmt_cp_add_remote_oob_data *cp = data;
u8 status;
int err;
BT_DBG("hci%u ", index);
@ -2104,19 +2105,21 @@ static int add_remote_oob_data(struct sock *sk, u16 index, void *data,
hdev = hci_dev_get(index);
if (!hdev)
return cmd_status(sk, index, MGMT_OP_ADD_REMOTE_OOB_DATA,
MGMT_STATUS_INVALID_PARAMS);
return cmd_complete(sk, index, MGMT_OP_ADD_REMOTE_OOB_DATA,
MGMT_STATUS_INVALID_PARAMS,
&cp->addr, sizeof(cp->addr));
hci_dev_lock(hdev);
err = hci_add_remote_oob_data(hdev, &cp->addr.bdaddr, cp->hash,
cp->randomizer);
if (err < 0)
err = cmd_status(sk, index, MGMT_OP_ADD_REMOTE_OOB_DATA,
MGMT_STATUS_FAILED);
status = MGMT_STATUS_FAILED;
else
err = cmd_complete(sk, index, MGMT_OP_ADD_REMOTE_OOB_DATA, 0,
NULL, 0);
status = 0;
err = cmd_complete(sk, index, MGMT_OP_ADD_REMOTE_OOB_DATA, status,
&cp->addr, sizeof(cp->addr));
hci_dev_unlock(hdev);
hci_dev_put(hdev);
@ -2129,6 +2132,7 @@ static int remove_remote_oob_data(struct sock *sk, u16 index,
{
struct hci_dev *hdev;
struct mgmt_cp_remove_remote_oob_data *cp = data;
u8 status;
int err;
BT_DBG("hci%u ", index);
@ -2139,18 +2143,20 @@ static int remove_remote_oob_data(struct sock *sk, u16 index,
hdev = hci_dev_get(index);
if (!hdev)
return cmd_status(sk, index, MGMT_OP_REMOVE_REMOTE_OOB_DATA,
MGMT_STATUS_INVALID_PARAMS);
return cmd_complete(sk, index, MGMT_OP_REMOVE_REMOTE_OOB_DATA,
MGMT_STATUS_INVALID_PARAMS,
&cp->addr, sizeof(cp->addr));
hci_dev_lock(hdev);
err = hci_remove_remote_oob_data(hdev, &cp->addr.bdaddr);
if (err < 0)
err = cmd_status(sk, index, MGMT_OP_REMOVE_REMOTE_OOB_DATA,
MGMT_STATUS_INVALID_PARAMS);
status = MGMT_STATUS_INVALID_PARAMS;
else
err = cmd_complete(sk, index, MGMT_OP_REMOVE_REMOTE_OOB_DATA,
0, NULL, 0);
status = 0;
err = cmd_complete(sk, index, MGMT_OP_REMOVE_REMOTE_OOB_DATA, status,
&cp->addr, sizeof(cp->addr));
hci_dev_unlock(hdev);
hci_dev_put(hdev);