From patchwork Mon Mar 12 07:48: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: 146043 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 93A9AB6FA8 for ; Mon, 12 Mar 2012 18:48:42 +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 1S6zzX-0000zu-Os; Mon, 12 Mar 2012 07:48:27 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1S6zzV-0000zp-8Y for kernel-team@lists.ubuntu.com; Mon, 12 Mar 2012 07:48:25 +0000 Received: from mail-yw0-f49.google.com ([209.85.213.49]) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1S6zzV-0006rK-20 for kernel-team@lists.ubuntu.com; Mon, 12 Mar 2012 07:48:25 +0000 Received: by yhjj52 with SMTP id j52so2818779yhj.8 for ; Mon, 12 Mar 2012 00:48:23 -0700 (PDT) MIME-Version: 1.0 Received: by 10.68.136.97 with SMTP id pz1mr327195pbb.30.1331538503273; Mon, 12 Mar 2012 00:48:23 -0700 (PDT) Received: by 10.142.113.16 with HTTP; Mon, 12 Mar 2012 00:48:23 -0700 (PDT) Date: Mon, 12 Mar 2012 15:48:23 +0800 Message-ID: Subject: [Precise 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/791019 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. --- 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,