From patchwork Mon Mar 19 04:34:04 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Oneiric,SRU] Bluetooth: Fix l2cap conn failures for ssp devices Date: Sun, 18 Mar 2012 18:34:04 -0000 From: Ming Lei X-Patchwork-Id: 147462 Message-Id: To: kernel-team@lists.ubuntu.com >From 18daf1644e634bae951a6e3d4d19d89170209762 Mon Sep 17 00:00:00 2001 From: Peter Hurley Date: Fri, 13 Jan 2012 15:11:30 +0100 Subject: [Oneiric SRU][PATCH] Bluetooth: Fix l2cap conn failures for ssp devices Commit 330605423c fixed l2cap conn establishment for non-ssp remote devices by not setting HCI_CONN_ENCRYPT_PEND every time conn security is tested (which was always returning failure on any subsequent security checks). However, this broke l2cap conn establishment for ssp remote devices when an ACL link was already established at SDP-level security. This fix ensures that encryption must be pending whenever authentication is also pending. BugLink: http://bugs.launchpad.net/bugs/872044 Upstream discusstion: http://marc.info/?t=131292188200002&r=1&w=2 Impact: cannot send files to other BT device Fix: can send files to other BT device Signed-off-by: Peter Hurley Tested-by: Daniel Wagner Acked-by: Marcel Holtmann Signed-off-by: Johan Hedberg Signed-off-by: Ming Lei Acked-by: Stefan Bader --- This wasn't cc:ed stable@kernel.org, but was merged to 3.3-rc6 as commit 18daf1644e634bae951a6e3d4d19d89170209762(Bluetooth: Fix l2cap conn failures for ssp devices). --- net/bluetooth/hci_conn.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) sizeof(cp), &cp); diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c index 3db4324..07bc69e 100644 --- a/net/bluetooth/hci_conn.c +++ b/net/bluetooth/hci_conn.c @@ -635,6 +635,10 @@ static int hci_conn_auth(struct hci_conn *conn, __u8 sec_level, __u8 auth_type) if (!test_and_set_bit(HCI_CONN_AUTH_PEND, &conn->pend)) { struct hci_cp_auth_requested cp; + + /* encrypt must be pending if auth is also pending */ + set_bit(HCI_CONN_ENCRYPT_PEND, &conn->pend); + cp.handle = cpu_to_le16(conn->handle); hci_send_cmd(conn->hdev, HCI_OP_AUTH_REQUESTED,