From: Andrei Emeltchenko <andrei.emeltchenko.news@gmail.com>
To: Marcel Holtmann <marcel@holtmann.org>
Cc: Nick Pelly <npelly@google.com>, Lan Zhu <zhu.lan.cn@gmail.com>,
linux-bluetooth@vger.kernel.org
Subject: Re: kernel panic happens when disconnecting Bluetooth headset
Date: Tue, 22 Dec 2009 18:20:50 +0200 [thread overview]
Message-ID: <508e92ca0912220820j30e08e0ar84bcf0efb0bf4f9a@mail.gmail.com> (raw)
In-Reply-To: <1261177347.4041.103.camel@localhost.localdomain>
Hi Marcel,
On Sat, Dec 19, 2009 at 1:02 AM, Marcel Holtmann <marcel@holtmann.org> wrot=
e:
> Hi Nick,
>
>> >> Processing a RFCOMM UA frame when the socket is closed and we were no=
t
>> >> the
>> >> RFCOMM initiator would cause rfcomm_session_put() to be called twice
>> >> during
>> >> rfcomm_process_rx(). This would cause a kernel panic in
>> >> rfcomm_session_close.
>> >>
>> >> This could be easily reproduced during disconnect with devices such a=
s
>> >> Motorola H270 that send RFCOMM UA followed quickly by L2CAP disconnec=
t
>> >> request.
>> >> This hcidump for this looks like:
>> >>
>> >> 2009-09-21 17:22:37.788895 < ACL data: handle 1 flags 0x02 dlen 8
>> >> =A0 =A0L2CAP(d): cid 0x0041 len 4 [psm 3]
>> >> =A0 =A0 =A0RFCOMM(s): DISC: cr 0 dlci 20 pf 1 ilen 0 fcs 0x7d
>> >> 2009-09-21 17:22:37.906204 > HCI Event: Number of Completed Packets
>> >> (0x13)
>> >> plen 5
>> >> =A0 =A0handle 1 packets 1
>> >> 2009-09-21 17:22:37.933090 > ACL data: handle 1 flags 0x02 dlen 8
>> >> =A0 =A0L2CAP(d): cid 0x0040 len 4 [psm 3]
>> >> =A0 =A0 =A0RFCOMM(s): UA: cr 0 dlci 20 pf 1 ilen 0 fcs 0x57
>> >> 2009-09-21 17:22:38.636764 < ACL data: handle 1 flags 0x02 dlen 8
>> >> =A0 =A0L2CAP(d): cid 0x0041 len 4 [psm 3]
>> >> =A0 =A0 =A0RFCOMM(s): DISC: cr 0 dlci 0 pf 1 ilen 0 fcs 0x9c
>> >> 2009-09-21 17:22:38.744125 > HCI Event: Number of Completed Packets
>> >> (0x13)
>> >> plen 5
>> >> =A0 =A0handle 1 packets 1
>> >> 2009-09-21 17:22:38.763687 > ACL data: handle 1 flags 0x02 dlen 8
>> >> =A0 =A0L2CAP(d): cid 0x0040 len 4 [psm 3]
>> >> =A0 =A0 =A0RFCOMM(s): UA: cr 0 dlci 0 pf 1 ilen 0 fcs 0xb6
>> >> 2009-09-21 17:22:38.783554 > ACL data: handle 1 flags 0x02 dlen 12
>> >> =A0 =A0L2CAP(s): Disconn req: dcid 0x0040 scid 0x0041
>> >>
>> >> Avoid calling rfcomm_session_put() twice by skipping this call
>> >> in rfcomm_recv_ua() if the socket is closed.
>> >>
>> >> Picked from:
>> >> http://android.git.kernel.org/?p=3Dkernel/common.git;a=3Dcommit;h=3D1=
048e007842da2d6440679e1ca80f45438a6369d
>> >>
>> >> Signed-off-by: Nick Pelly <npelly@google.com>
>> >> Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@nokia.com>
>> >> ---
>> >> =A0net/bluetooth/rfcomm/core.c | =A0 =A03 ++-
>> >> =A01 files changed, 2 insertions(+), 1 deletions(-)
>> >>
>> >> diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.=
c
>> >> index 0313e88..56ffcb8 100644
>> >> --- a/net/bluetooth/rfcomm/core.c
>> >> +++ b/net/bluetooth/rfcomm/core.c
>> >> @@ -1148,7 +1148,8 @@ static int rfcomm_recv_ua(struct rfcomm_session
>> >> *s, u8 dlci)
>> >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 break;
>> >>
>> >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 case BT_DISCONN:
>> >> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 rfcomm_session_put(s);
>> >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (s->sock->sk->sk_sta=
te !=3D BT_CLOSED)
>> >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 rfcomm_=
session_put(s);
>> >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 break;
>> >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 }
>> >> =A0 =A0 =A0 =A0 }
>> >
>> > I am not a big fan of conditionally decreasing reference counts. I do
>> > think it would be better to fix this by holding an extra pair of
>> > reference counts or actually fixing the imbalance. What about the othe=
r
>> > patches I proposed?
>>
>> Your proposed patch was to add an extra hold() / put() reference count
>> around the offending put(). I did test this patch, and found it does
>> not fix the underlying imbalance, it just moves the kernel panic
>> somewhere else.
>>
>> As best I can tell, my patch does address the underlying imbalance. It
>> is in production on Android phones and seems to work well. As best I
>> can tell, there is not a cleaner solution that does not involve
>> significant refactoring of rfcomm refcounting.
We have this patch also in Nokia N900 phone. And this was the best solution
for the problem mentioned.
> the RFCOMM reference counting is something nasty and it does need to be
> re-written. One thing that needs to happen that we stop using the L2CAP
> sockets directly. We have to put a proper L2CAP in-kernel specific API
> in between that ensures we are not mixing things. That is the one issues
> that we always had in this area.
>
> Before applying this patch, I like to have additionally a comment in
> front of this conditional put call that explains a little bit the
> problem area here. The long explanation with logs etc. should be in the
> commit message. I have to make sure that we fully understand what is
> going on here and why we did it.
What do you think about following comment:
--- a/net/bluetooth/rfcomm/core.c
+++ b/net/bluetooth/rfcomm/core.c
@@ -1151,7 +1151,11 @@ static int rfcomm_recv_ua(struct rfcomm_session
*s, u8 dlci)
break;
case BT_DISCONN:
- rfcomm_session_put(s);
+ /* When socket is closed and we are not RFCOMM
+ * initiator rfcomm_process_rx already calls
+ * rfcomm_session_put */
+ if (s->sock->sk->sk_state !=3D BT_CLOSED)
+ rfcomm_session_put(s);
break;
}
}
--=20
Regards
Andrei
next prev parent reply other threads:[~2009-12-22 16:20 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-11 7:53 kernel panic happens when disconnecting Bluetooth headset Lan Zhu
2009-09-11 8:23 ` Marcel Holtmann
2009-09-11 15:28 ` Lan Zhu
2009-09-11 16:45 ` Marcel Holtmann
2009-09-14 9:10 ` Lan Zhu
2009-09-17 1:21 ` Nick Pelly
2009-09-17 2:17 ` Marcel Holtmann
2009-09-18 8:06 ` Andrei Emeltchenko
2009-09-18 15:24 ` Marcel Holtmann
2009-09-22 0:52 ` Nick Pelly
2009-09-22 1:29 ` Nick Pelly
2009-09-22 20:18 ` Nick Pelly
2009-09-23 7:22 ` Dave Young
2009-12-18 14:20 ` Andrei Emeltchenko
2009-12-18 21:59 ` Marcel Holtmann
2009-12-18 22:30 ` Nick Pelly
2009-12-18 23:02 ` Marcel Holtmann
2009-12-22 16:20 ` Andrei Emeltchenko [this message]
2010-02-03 2:11 ` Nick Pelly
2010-02-03 20:21 ` Marcel Holtmann
2010-02-04 0:19 ` Nick Pelly
2009-12-30 14:22 ` Luiz Pena
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=508e92ca0912220820j30e08e0ar84bcf0efb0bf4f9a@mail.gmail.com \
--to=andrei.emeltchenko.news@gmail.com \
--cc=linux-bluetooth@vger.kernel.org \
--cc=marcel@holtmann.org \
--cc=npelly@google.com \
--cc=zhu.lan.cn@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).