diff options
author | Gustavo F. Padovan <padovan@profusion.mobi> | 2010-05-01 16:15:41 -0300 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2010-05-10 09:28:50 +0200 |
commit | 0ee0d20855ae9271de3f6695f4cafc08ab2533bb (patch) | |
tree | 2f3c1401a15d0b73b0ae21d527161972e5c773b3 /net/bluetooth/l2cap.c | |
parent | f6e6b16823de0aff31cb8ee8c098383e3aceec58 (diff) | |
download | linux-3.10-0ee0d20855ae9271de3f6695f4cafc08ab2533bb.tar.gz linux-3.10-0ee0d20855ae9271de3f6695f4cafc08ab2533bb.tar.bz2 linux-3.10-0ee0d20855ae9271de3f6695f4cafc08ab2533bb.zip |
Bluetooth: Fix crash when monitor timeout expires
The code was crashing due to a invalid access to hci_conn after the
channel disconnect.
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Reviewed-by: João Paulo Rechi Vita <jprvita@profusion.mobi>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/l2cap.c')
-rw-r--r-- | net/bluetooth/l2cap.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c index 4c7b2d22faa..2f9bbad4288 100644 --- a/net/bluetooth/l2cap.c +++ b/net/bluetooth/l2cap.c @@ -1568,6 +1568,9 @@ static struct sk_buff *l2cap_create_iframe_pdu(struct sock *sk, struct msghdr *m BT_DBG("sk %p len %d", sk, (int)len); + if (!conn) + return ERR_PTR(-ENOTCONN); + if (sdulen) hlen += 2; |