* [PATCH bluetooth] Bluetooth: Fix missing channel unlock in l2cap_le_credits
@ 2014-10-13 18:24 Martin Townsend
2014-10-14 8:31 ` Jukka Rissanen
2014-10-17 14:18 ` Marcel Holtmann
0 siblings, 2 replies; 4+ messages in thread
From: Martin Townsend @ 2014-10-13 18:24 UTC (permalink / raw)
To: linux-bluetooth; +Cc: marcel, jukka.rissanen, johan.hedberg, Martin Townsend
In the error case where credits is greater than max_credits there
is a missing l2cap_chan_unlock before returning.
Signed-off-by: Martin Townsend <mtownsend1973@gmail.com>
---
net/bluetooth/l2cap_core.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 46547b9..bfb6af8 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -5544,6 +5544,7 @@ static inline int l2cap_le_credits(struct l2cap_conn *conn,
if (credits > max_credits) {
BT_ERR("LE credits overflow");
l2cap_send_disconn_req(chan, ECONNRESET);
+ l2cap_chan_unlock(chan);
/* Return 0 so that we don't trigger an unnecessary
* command reject packet.
--
1.9.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH bluetooth] Bluetooth: Fix missing channel unlock in l2cap_le_credits
2014-10-13 18:24 [PATCH bluetooth] Bluetooth: Fix missing channel unlock in l2cap_le_credits Martin Townsend
@ 2014-10-14 8:31 ` Jukka Rissanen
2014-10-14 8:38 ` Johan Hedberg
2014-10-17 14:18 ` Marcel Holtmann
1 sibling, 1 reply; 4+ messages in thread
From: Jukka Rissanen @ 2014-10-14 8:31 UTC (permalink / raw)
To: Martin Townsend; +Cc: linux-bluetooth, marcel, johan.hedberg
Hi,
On ma, 2014-10-13 at 19:24 +0100, Martin Townsend wrote:
> In the error case where credits is greater than max_credits there
> is a missing l2cap_chan_unlock before returning.
>
> Signed-off-by: Martin Townsend <mtownsend1973@gmail.com>
> ---
> net/bluetooth/l2cap_core.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
> index 46547b9..bfb6af8 100644
> --- a/net/bluetooth/l2cap_core.c
> +++ b/net/bluetooth/l2cap_core.c
> @@ -5544,6 +5544,7 @@ static inline int l2cap_le_credits(struct l2cap_conn *conn,
> if (credits > max_credits) {
> BT_ERR("LE credits overflow");
> l2cap_send_disconn_req(chan, ECONNRESET);
> + l2cap_chan_unlock(chan);
>
> /* Return 0 so that we don't trigger an unnecessary
> * command reject packet.
I did some testing with this patch and although it did not fix the
inconsistent lock issue I am seeing, it did fix the mutex hang. I have
two locking issue and this patch fixed the other one.
Tested-by: Jukka Rissanen <jukka.rissanen@linux.intel.com>
Cheers,
Jukka
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH bluetooth] Bluetooth: Fix missing channel unlock in l2cap_le_credits
2014-10-14 8:31 ` Jukka Rissanen
@ 2014-10-14 8:38 ` Johan Hedberg
0 siblings, 0 replies; 4+ messages in thread
From: Johan Hedberg @ 2014-10-14 8:38 UTC (permalink / raw)
To: Jukka Rissanen; +Cc: Martin Townsend, linux-bluetooth, marcel
Hi Jukka,
On Tue, Oct 14, 2014, Jukka Rissanen wrote:
> On ma, 2014-10-13 at 19:24 +0100, Martin Townsend wrote:
> > In the error case where credits is greater than max_credits there
> > is a missing l2cap_chan_unlock before returning.
> >
> > Signed-off-by: Martin Townsend <mtownsend1973@gmail.com>
> > ---
> > net/bluetooth/l2cap_core.c | 1 +
> > 1 file changed, 1 insertion(+)
> >
> > diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
> > index 46547b9..bfb6af8 100644
> > --- a/net/bluetooth/l2cap_core.c
> > +++ b/net/bluetooth/l2cap_core.c
> > @@ -5544,6 +5544,7 @@ static inline int l2cap_le_credits(struct l2cap_conn *conn,
> > if (credits > max_credits) {
> > BT_ERR("LE credits overflow");
> > l2cap_send_disconn_req(chan, ECONNRESET);
> > + l2cap_chan_unlock(chan);
> >
> > /* Return 0 so that we don't trigger an unnecessary
> > * command reject packet.
>
> I did some testing with this patch and although it did not fix the
> inconsistent lock issue I am seeing, it did fix the mutex hang. I have
> two locking issue and this patch fixed the other one.
When this code branch is taken it means that the remote side is not
behaving properly and is sending a ridiculous amount of credits. It's
worth investigating this further to fix such an issue (assuming that
other side is also running BlueZ).
> Tested-by: Jukka Rissanen <jukka.rissanen@linux.intel.com>
Thanks for testing!
Johan
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH bluetooth] Bluetooth: Fix missing channel unlock in l2cap_le_credits
2014-10-13 18:24 [PATCH bluetooth] Bluetooth: Fix missing channel unlock in l2cap_le_credits Martin Townsend
2014-10-14 8:31 ` Jukka Rissanen
@ 2014-10-17 14:18 ` Marcel Holtmann
1 sibling, 0 replies; 4+ messages in thread
From: Marcel Holtmann @ 2014-10-17 14:18 UTC (permalink / raw)
To: Martin Townsend; +Cc: linux-bluetooth, jukka.rissanen, Johan Hedberg
Hi Martin,
> In the error case where credits is greater than max_credits there
> is a missing l2cap_chan_unlock before returning.
>
> Signed-off-by: Martin Townsend <mtownsend1973@gmail.com>
> ---
> net/bluetooth/l2cap_core.c | 1 +
> 1 file changed, 1 insertion(+)
patch has been applied to bluetooth-next tree.
Regards
Marcel
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-10-17 14:18 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-13 18:24 [PATCH bluetooth] Bluetooth: Fix missing channel unlock in l2cap_le_credits Martin Townsend
2014-10-14 8:31 ` Jukka Rissanen
2014-10-14 8:38 ` Johan Hedberg
2014-10-17 14:18 ` Marcel Holtmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).