Bluetooth: Fix processing A2MP chan in security_cfm

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=78eb2f985c17eab34a0ef919b3263d6b08064e98
Commit:     78eb2f985c17eab34a0ef919b3263d6b08064e98
Parent:     d9fc1d54f6f8123909cdee4fa98ab1ebf6c8651c
Author:     Andrei Emeltchenko <andrei.emeltchenko at intel.com>
AuthorDate: Thu Jul 19 17:03:47 2012 +0300
Committer:  Gustavo Padovan <gustavo.padovan at collabora.co.uk>
CommitDate: Mon Aug 6 15:02:56 2012 -0300

    Bluetooth: Fix processing A2MP chan in security_cfm
    
    Do not process A2MP channel in l2cap_security_cfm
    
    Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko at intel.com>
    Signed-off-by: Gustavo Padovan <gustavo.padovan at collabora.co.uk>
---
 net/bluetooth/l2cap_core.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index a8964db..64d88a6 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -5404,6 +5404,11 @@ int l2cap_security_cfm(struct hci_conn *hcon, u8 status, u8 encrypt)
 		BT_DBG("chan %p scid 0x%4.4x state %s", chan, chan->scid,
 		       state_to_string(chan->state));
 
+		if (chan->chan_type == L2CAP_CHAN_CONN_FIX_A2MP) {
+			l2cap_chan_unlock(chan);
+			continue;
+		}
+
 		if (chan->scid == L2CAP_CID_LE_DATA) {
 			if (!status && encrypt) {
 				chan->sec_level = hcon->sec_level;