iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bluetooth: Fix incorrect pending cmd removal in pairing_complete()

Browse Source 
The pairing_complete() function is used as a pending mgmt command
cmd_complete callback. The expectation of such functions is that they
are not responsible themselves for calling mgmt_pending_remove(). This
patch fixes the incorrect mgmt_pending_remove() call in
pairing_complete() and adds it to the appropriate changes.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Johan Hedberg
2014-12-11 21:45:45 +02:00
committed by Marcel Holtmann
parent 15013aeb63
commit a511b35ba4
1 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
net/bluetooth/mgmt.c
View File

@@ -3115,7 +3115,6 @@ static void pairing_complete(struct pending_cmd *cmd, u8 status)
conn->disconn_cfm_cb = NULL; conn->disconn_cfm_cb = NULL;
hci_conn_drop(conn); hci_conn_drop(conn);
mgmt_pending_remove(cmd);
/* The device is paired so there is no need to remove /* The device is paired so there is no need to remove
* its connection parameters anymore. * its connection parameters anymore.
@@ -3131,8 +3130,10 @@ void mgmt_smp_complete(struct hci_conn *conn, bool complete)
struct pending_cmd *cmd; struct pending_cmd *cmd;
cmd = find_pairing(conn); cmd = find_pairing(conn);
if (cmd) if (cmd) {
cmd->cmd_complete(cmd, status); cmd->cmd_complete(cmd, status);
mgmt_pending_remove(cmd);
}
} }
static void pairing_complete_cb(struct hci_conn *conn, u8 status) static void pairing_complete_cb(struct hci_conn *conn, u8 status)
@@ -3142,10 +3143,13 @@ static void pairing_complete_cb(struct hci_conn *conn, u8 status)
BT_DBG("status %u", status); BT_DBG("status %u", status);
cmd = find_pairing(conn); cmd = find_pairing(conn);
if (!cmd) if (!cmd) {
BT_DBG("Unable to find a pending command"); BT_DBG("Unable to find a pending command");
else return;
cmd->cmd_complete(cmd, mgmt_status(status)); }
cmd->cmd_complete(cmd, mgmt_status(status));
mgmt_pending_remove(cmd);
} }
static void le_pairing_complete_cb(struct hci_conn *conn, u8 status) static void le_pairing_complete_cb(struct hci_conn *conn, u8 status)
@@ -3158,10 +3162,13 @@ static void le_pairing_complete_cb(struct hci_conn *conn, u8 status)
return; return;
cmd = find_pairing(conn); cmd = find_pairing(conn);
if (!cmd) if (!cmd) {
BT_DBG("Unable to find a pending command"); BT_DBG("Unable to find a pending command");
else return;
cmd->cmd_complete(cmd, mgmt_status(status)); }
cmd->cmd_complete(cmd, mgmt_status(status));
mgmt_pending_remove(cmd);
} }
static int pair_device(struct sock *sk, struct hci_dev *hdev, void *data, static int pair_device(struct sock *sk, struct hci_dev *hdev, void *data,
@@ -3275,8 +3282,10 @@ static int pair_device(struct sock *sk, struct hci_dev *hdev, void *data,
cmd->user_data = hci_conn_get(conn); cmd->user_data = hci_conn_get(conn);
if ((conn->state == BT_CONNECTED || conn->state == BT_CONFIG) && if ((conn->state == BT_CONNECTED || conn->state == BT_CONFIG) &&
hci_conn_security(conn, sec_level, auth_type, true)) hci_conn_security(conn, sec_level, auth_type, true)) {
pairing_complete(cmd, 0); cmd->cmd_complete(cmd, 0);
mgmt_pending_remove(cmd);
}
err = 0; err = 0;
@@ -3318,7 +3327,8 @@ static int cancel_pair_device(struct sock *sk, struct hci_dev *hdev, void *data,
goto unlock; goto unlock;
} }
pairing_complete(cmd, MGMT_STATUS_CANCELLED); cmd->cmd_complete(cmd, MGMT_STATUS_CANCELLED);
mgmt_pending_remove(cmd);
err = cmd_complete(sk, hdev->id, MGMT_OP_CANCEL_PAIR_DEVICE, 0, err = cmd_complete(sk, hdev->id, MGMT_OP_CANCEL_PAIR_DEVICE, 0,
addr, sizeof(*addr)); addr, sizeof(*addr));
@@ -6687,8 +6697,10 @@ void mgmt_auth_failed(struct hci_conn *conn, u8 hci_status)
mgmt_event(MGMT_EV_AUTH_FAILED, conn->hdev, &ev, sizeof(ev), mgmt_event(MGMT_EV_AUTH_FAILED, conn->hdev, &ev, sizeof(ev),
cmd ? cmd->sk : NULL); cmd ? cmd->sk : NULL);
if (cmd) if (cmd) {
pairing_complete(cmd, status); cmd->cmd_complete(cmd, status);
mgmt_pending_remove(cmd);
}
} }
void mgmt_auth_enable_complete(struct hci_dev *hdev, u8 status) void mgmt_auth_enable_complete(struct hci_dev *hdev, u8 status)