Skip to content

Commit

Permalink
Bluetooth: Remove unnecessary hdev locking in smp.c
Browse files Browse the repository at this point in the history
Now that the SMP related key lists are converted to RCU there is nothing
in smp_cmd_sign_info() or smp_cmd_ident_addr_info() that would require
taking the hdev lock (including the smp_distribute_keys call). This
patch removes this unnecessary locking.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
  • Loading branch information
Johan Hedberg authored and Marcel Holtmann committed Nov 15, 2014
1 parent adae20c commit d88b5bb
Showing 1 changed file with 0 additions and 7 deletions.
7 changes: 0 additions & 7 deletions net/bluetooth/smp.c
Original file line number Diff line number Diff line change
Expand Up @@ -1374,8 +1374,6 @@ static int smp_cmd_ident_addr_info(struct l2cap_conn *conn,

skb_pull(skb, sizeof(*info));

hci_dev_lock(hcon->hdev);

/* Strictly speaking the Core Specification (4.1) allows sending
* an empty address which would force us to rely on just the IRK
* as "identity information". However, since such
Expand Down Expand Up @@ -1403,8 +1401,6 @@ static int smp_cmd_ident_addr_info(struct l2cap_conn *conn,
if (!(smp->remote_key_dist & KEY_DIST_MASK))
smp_distribute_keys(smp);

hci_dev_unlock(hcon->hdev);

return 0;
}

Expand All @@ -1413,7 +1409,6 @@ static int smp_cmd_sign_info(struct l2cap_conn *conn, struct sk_buff *skb)
struct smp_cmd_sign_info *rp = (void *) skb->data;
struct l2cap_chan *chan = conn->smp;
struct smp_chan *smp = chan->data;
struct hci_dev *hdev = conn->hcon->hdev;
struct smp_csrk *csrk;

BT_DBG("conn %p", conn);
Expand All @@ -1426,15 +1421,13 @@ static int smp_cmd_sign_info(struct l2cap_conn *conn, struct sk_buff *skb)

skb_pull(skb, sizeof(*rp));

hci_dev_lock(hdev);
csrk = kzalloc(sizeof(*csrk), GFP_KERNEL);
if (csrk) {
csrk->master = 0x01;
memcpy(csrk->val, rp->csrk, sizeof(csrk->val));
}
smp->csrk = csrk;
smp_distribute_keys(smp);
hci_dev_unlock(hdev);

return 0;
}
Expand Down

0 comments on commit d88b5bb

Please sign in to comment.