* [PATCH] Bluetooth: Fix double locking in LE and conless chan
@ 2012-02-24 14:35 Andrei Emeltchenko
2012-02-24 16:35 ` Ulisses Furquim
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Andrei Emeltchenko @ 2012-02-24 14:35 UTC (permalink / raw)
To: linux-bluetooth
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Remove socket lock since chan->ops->recv locks socket itself.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
---
net/bluetooth/l2cap_core.c | 24 ++++--------------------
1 files changed, 4 insertions(+), 20 deletions(-)
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index b2f1565..ed50e4a 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -4382,18 +4382,13 @@ done:
static inline int l2cap_conless_channel(struct l2cap_conn *conn, __le16 psm, struct sk_buff *skb)
{
- struct sock *sk = NULL;
struct l2cap_chan *chan;
chan = l2cap_global_chan_by_psm(0, psm, conn->src);
if (!chan)
goto drop;
- sk = chan->sk;
-
- lock_sock(sk);
-
- BT_DBG("sk %p, len %d", sk, skb->len);
+ BT_DBG("chan %p, len %d", chan, skb->len);
if (chan->state != BT_BOUND && chan->state != BT_CONNECTED)
goto drop;
@@ -4402,31 +4397,23 @@ static inline int l2cap_conless_channel(struct l2cap_conn *conn, __le16 psm, str
goto drop;
if (!chan->ops->recv(chan->data, skb))
- goto done;
+ return 0;
drop:
kfree_skb(skb);
-done:
- if (sk)
- release_sock(sk);
return 0;
}
static inline int l2cap_att_channel(struct l2cap_conn *conn, __le16 cid, struct sk_buff *skb)
{
- struct sock *sk = NULL;
struct l2cap_chan *chan;
chan = l2cap_global_chan_by_scid(0, cid, conn->src);
if (!chan)
goto drop;
- sk = chan->sk;
-
- lock_sock(sk);
-
- BT_DBG("sk %p, len %d", sk, skb->len);
+ BT_DBG("chan %p, len %d", chan, skb->len);
if (chan->state != BT_BOUND && chan->state != BT_CONNECTED)
goto drop;
@@ -4435,14 +4422,11 @@ static inline int l2cap_att_channel(struct l2cap_conn *conn, __le16 cid, struct
goto drop;
if (!chan->ops->recv(chan->data, skb))
- goto done;
+ return 0;
drop:
kfree_skb(skb);
-done:
- if (sk)
- release_sock(sk);
return 0;
}
--
1.7.9
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] Bluetooth: Fix double locking in LE and conless chan
2012-02-24 14:35 [PATCH] Bluetooth: Fix double locking in LE and conless chan Andrei Emeltchenko
@ 2012-02-24 16:35 ` Ulisses Furquim
2012-02-24 20:21 ` Gustavo Padovan
2012-02-24 20:28 ` Johan Hedberg
2 siblings, 0 replies; 4+ messages in thread
From: Ulisses Furquim @ 2012-02-24 16:35 UTC (permalink / raw)
To: Andrei Emeltchenko; +Cc: linux-bluetooth
Hi Andrei,
On Fri, Feb 24, 2012 at 12:35 PM, Andrei Emeltchenko
<Andrei.Emeltchenko.news@gmail.com> wrote:
> From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
>
> Remove socket lock since chan->ops->recv locks socket itself.
>
> Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
> ---
> net/bluetooth/l2cap_core.c | 24 ++++--------------------
> 1 files changed, 4 insertions(+), 20 deletions(-)
Looks good. Please remember to test these paths too when making
changes that touch whole L2CAP core.
Reviewed-by: Ulisses Furquim <ulisses@profusion.mobi>
Regards,
--
Ulisses Furquim
ProFUSION embedded systems
http://profusion.mobi
Mobile: +55 19 9250 0942
Skype: ulissesffs
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] Bluetooth: Fix double locking in LE and conless chan
2012-02-24 14:35 [PATCH] Bluetooth: Fix double locking in LE and conless chan Andrei Emeltchenko
2012-02-24 16:35 ` Ulisses Furquim
@ 2012-02-24 20:21 ` Gustavo Padovan
2012-02-24 20:28 ` Johan Hedberg
2 siblings, 0 replies; 4+ messages in thread
From: Gustavo Padovan @ 2012-02-24 20:21 UTC (permalink / raw)
To: Andrei Emeltchenko; +Cc: linux-bluetooth
Hi Andrei,
* Andrei Emeltchenko <Andrei.Emeltchenko.news@gmail.com> [2012-02-24 16:35:32 +0200]:
> From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
>
> Remove socket lock since chan->ops->recv locks socket itself.
>
> Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
> ---
> net/bluetooth/l2cap_core.c | 24 ++++--------------------
> 1 files changed, 4 insertions(+), 20 deletions(-)
Acked-by: Gustavo F. Padovan <padovan@profusion.mobi>
Gustavo
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] Bluetooth: Fix double locking in LE and conless chan
2012-02-24 14:35 [PATCH] Bluetooth: Fix double locking in LE and conless chan Andrei Emeltchenko
2012-02-24 16:35 ` Ulisses Furquim
2012-02-24 20:21 ` Gustavo Padovan
@ 2012-02-24 20:28 ` Johan Hedberg
2 siblings, 0 replies; 4+ messages in thread
From: Johan Hedberg @ 2012-02-24 20:28 UTC (permalink / raw)
To: Andrei Emeltchenko; +Cc: linux-bluetooth
Hi Andrei,
On Fri, Feb 24, 2012, Andrei Emeltchenko wrote:
> Remove socket lock since chan->ops->recv locks socket itself.
>
> Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
> ---
> net/bluetooth/l2cap_core.c | 24 ++++--------------------
> 1 files changed, 4 insertions(+), 20 deletions(-)
Applied. Thanks.
Johan
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-02-24 20:28 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-02-24 14:35 [PATCH] Bluetooth: Fix double locking in LE and conless chan Andrei Emeltchenko
2012-02-24 16:35 ` Ulisses Furquim
2012-02-24 20:21 ` Gustavo Padovan
2012-02-24 20:28 ` Johan Hedberg
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.