From patchwork Mon Mar 12 13:59:23 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 146104 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 78798B6F13 for ; Tue, 13 Mar 2012 00:59:35 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1S75mY-00069q-NU; Mon, 12 Mar 2012 13:59:26 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1S75mW-00068O-Uq for kernel-team@lists.ubuntu.com; Mon, 12 Mar 2012 13:59:24 +0000 Received: from mail-pz0-f49.google.com ([209.85.210.49]) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1S75mW-0004pW-Ou for kernel-team@lists.ubuntu.com; Mon, 12 Mar 2012 13:59:24 +0000 Received: by dakp5 with SMTP id p5so5746562dak.8 for ; Mon, 12 Mar 2012 06:59:23 -0700 (PDT) MIME-Version: 1.0 Received: by 10.68.230.7 with SMTP id su7mr1510131pbc.105.1331560763103; Mon, 12 Mar 2012 06:59:23 -0700 (PDT) Received: by 10.142.113.16 with HTTP; Mon, 12 Mar 2012 06:59:23 -0700 (PDT) Date: Mon, 12 Mar 2012 21:59:23 +0800 Message-ID: Subject: [PATCH] Bluetooth: Fix l2cap conn failures for ssp devices From: Ming Lei To: kernel-team@lists.ubuntu.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@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: [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 Signed-off-by: Peter Hurley Tested-by: Daniel Wagner Acked-by: Marcel Holtmann Signed-off-by: Johan Hedberg --- 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,