summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorAnderson Briglia <anderson.briglia@openbossa.org>2011-02-21 15:09:23 -0300
committerGustavo F. Padovan <padovan@profusion.mobi>2011-02-21 17:57:41 -0300
commit15c4794fe247d85ce38eb5f5e2a5855d996f56cd (patch)
treeedc8eb2aec26ad9a97c0480feb19e43208f27c5b /net
parenta664b5bc77fbc80c163de5606114659d3cbeb043 (diff)
downloadlinux-stable-15c4794fe247d85ce38eb5f5e2a5855d996f56cd.tar.gz
linux-stable-15c4794fe247d85ce38eb5f5e2a5855d996f56cd.tar.bz2
linux-stable-15c4794fe247d85ce38eb5f5e2a5855d996f56cd.zip
Bluetooth: Fix LE conn creation
This patch prevents a crash when remote host tries to create a LE link which already exists. i.e.: call l2test twice passing the same parameters. Signed-off-by: Anderson Briglia <anderson.briglia@openbossa.org> Signed-off-by: Ville Tervo <ville.tervo@nokia.com> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net')
-rw-r--r--net/bluetooth/hci_conn.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index 6d8b988d9ef6..4504cb6af6ae 100644
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -430,8 +430,9 @@ struct hci_conn *hci_connect(struct hci_dev *hdev, int type, bdaddr_t *dst, __u8
if (type == LE_LINK) {
le = hci_conn_hash_lookup_ba(hdev, LE_LINK, dst);
- if (!le)
- le = hci_conn_add(hdev, LE_LINK, dst);
+ if (le)
+ return NULL;
+ le = hci_conn_add(hdev, LE_LINK, dst);
if (!le)
return NULL;
if (le->state == BT_OPEN)