2011-02-22 19:10:53

by Anderson Briglia

Subject: [PATCH v2] Bluetooth: Use ERR_PTR as return error from hci_connect

From: Ville Tervo <[email protected]>

Use ERR_PTR mechanism to return error from hci_connect.

Signed-off-by: Ville Tervo <[email protected]>
Signed-off-by: Anderson Briglia <[email protected]>
---
net/bluetooth/hci_conn.c | 4 ++--
net/bluetooth/l2cap_core.c | 10 ++++------
net/bluetooth/mgmt.c | 4 ++--
net/bluetooth/sco.c | 6 +++---
4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index 4504cb6..7a6f56b 100644
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -431,10 +431,10 @@ 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)
- return NULL;
+ return ERR_PTR(-EBUSY);
le = hci_conn_add(hdev, LE_LINK, dst);
if (!le)
- return NULL;
+ return ERR_PTR(-ENOMEM);
if (le->state == BT_OPEN)
hci_le_connect(le);

diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index efcef0d..e76e9e5 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -841,7 +841,7 @@ int l2cap_do_connect(struct sock *sk)
struct hci_conn *hcon;
struct hci_dev *hdev;
__u8 auth_type;
- int err;
+ int err = 0;

BT_DBG("%s -> %s psm 0x%2.2x", batostr(src), batostr(dst),
l2cap_pi(sk)->psm);
@@ -852,8 +852,6 @@ int l2cap_do_connect(struct sock *sk)

hci_dev_lock_bh(hdev);

- err = -ENOMEM;
-
auth_type = l2cap_get_auth_type(sk);

if (l2cap_pi(sk)->dcid == L2CAP_CID_LE_DATA)
@@ -863,8 +861,10 @@ int l2cap_do_connect(struct sock *sk)
hcon = hci_connect(hdev, ACL_LINK, dst,
l2cap_pi(sk)->sec_level, auth_type);

- if (!hcon)
+ if (IS_ERR(hcon)) {
+ err = PTR_ERR(hcon);
goto done;
+ }

conn = l2cap_conn_add(hcon, 0);
if (!conn) {
@@ -872,8 +872,6 @@ int l2cap_do_connect(struct sock *sk)
goto done;
}

- err = 0;
-
/* Update source addr of the socket */
bacpy(src, conn->src);

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 982becd..37cabb5 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -1149,8 +1149,8 @@ static int pair_device(struct sock *sk, unsigned char *data, u16 len)
}

conn = hci_connect(hdev, ACL_LINK, &cp->bdaddr, sec_level, auth_type);
- if (!conn) {
- err = -ENOMEM;
+ if (IS_ERR(conn)) {
+ err = PTR_ERR(conn);
goto unlock;
}

diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
index c9348dd..26f2f04 100644
--- a/net/bluetooth/sco.c
+++ b/net/bluetooth/sco.c
@@ -190,16 +190,16 @@ static int sco_connect(struct sock *sk)

hci_dev_lock_bh(hdev);

- err = -ENOMEM;
-
if (lmp_esco_capable(hdev) && !disable_esco)
type = ESCO_LINK;
else
type = SCO_LINK;

hcon = hci_connect(hdev, type, dst, BT_SECURITY_LOW, HCI_AT_NO_BONDING);
- if (!hcon)
+ if (IS_ERR(hcon)) {
+ err = PTR_ERR(hcon);
goto done;
+ }

conn = sco_conn_add(hcon, 0);
if (!conn) {
--
1.7.1

2011-02-27 20:12:22

by Gustavo Padovan

Subject: Re: [PATCH v2] Bluetooth: Use ERR_PTR as return error from hci_connect

Hi Briglia,

* [email protected] <[email protected]> [2011-02-22 16:10:53 -0300]:

> From: Ville Tervo <[email protected]>
>
> Use ERR_PTR mechanism to return error from hci_connect.
>
> Signed-off-by: Ville Tervo <[email protected]>
> Signed-off-by: Anderson Briglia <[email protected]>
> ---
> net/bluetooth/hci_conn.c | 4 ++--
> net/bluetooth/l2cap_core.c | 10 ++++------
> net/bluetooth/mgmt.c | 4 ++--
> net/bluetooth/sco.c | 6 +++---
> 4 files changed, 11 insertions(+), 13 deletions(-)

Patch is applied now, but I had to fix it, your error handling was still
wrong. Here are the changes I did to your patch:

diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 0bbb6c6..c9f9cec 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -841,7 +841,7 @@ int l2cap_do_connect(struct sock *sk)
struct hci_conn *hcon;
struct hci_dev *hdev;
__u8 auth_type;
- int err = 0;
+ int err;

BT_DBG("%s -> %s psm 0x%2.2x", batostr(src), batostr(dst),
l2cap_pi(sk)->psm);
@@ -869,6 +869,7 @@ int l2cap_do_connect(struct sock *sk)
conn = l2cap_conn_add(hcon, 0);
if (!conn) {
hci_conn_put(hcon);
+ err = -ENOMEM;
goto done;
}

@@ -890,6 +891,8 @@ int l2cap_do_connect(struct sock *sk)
l2cap_do_start(sk);
}

+ err = 0;
+
done:
hci_dev_unlock_bh(hdev);
hci_dev_put(hdev);
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
index 26f2f04..42fdffd 100644
--- a/net/bluetooth/sco.c
+++ b/net/bluetooth/sco.c
@@ -204,6 +204,7 @@ static int sco_connect(struct sock *sk)
conn = sco_conn_add(hcon, 0);
if (!conn) {
hci_conn_put(hcon);
+ err = -ENOMEM;
goto done;
}

--
Gustavo F. Padovan
http://profusion.mobi