From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 34AE4C33C9E for ; Sat, 11 Jan 2020 09:52:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 08C7620842 for ; Sat, 11 Jan 2020 09:52:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578736372; bh=EJyrZHXCKEcO7O4/CzqZT6lDKthtZuY3eKsy+vC63mQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=o0sIosl3JO+THzXWt6hKOPEMNCUfnA8s0Flz9clDzyQgkSpx8C06wC0ZeSAKvI23D OEwN0Yu1Uh04pnuG8IjYVxgsmWks9F/9cpC7J3B5jtrFmG16t1XzHCyoa8Efop6G3C 73DSoQ01FA+0ROlEcill5Z/f4vS3hAw88aV8rZCw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728995AbgAKJwv (ORCPT ); Sat, 11 Jan 2020 04:52:51 -0500 Received: from mail.kernel.org ([198.145.29.99]:38900 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728752AbgAKJwu (ORCPT ); Sat, 11 Jan 2020 04:52:50 -0500 Received: from localhost (unknown [62.119.166.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D31272082E; Sat, 11 Jan 2020 09:52:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578736370; bh=EJyrZHXCKEcO7O4/CzqZT6lDKthtZuY3eKsy+vC63mQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rZhw5b+mKrycNAkQf5cSuHY3tuxsFLVvpEFdC/OFXqlHj44DlJVg3MB0s/CW0+VvZ 9/L+bBXczbp9c7QBsiGMTatc9xIl7nFS8BKZ8yQUeqr0KVFWBYde6cVO8bhfMXmrx9 cKJ7hsblY8MQvwpwQ8Sj+c29pt4TqSNYxLis74v8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , Marcel Holtmann Subject: [PATCH 4.4 24/59] Bluetooth: delete a stray unlock Date: Sat, 11 Jan 2020 10:49:33 +0100 Message-Id: <20200111094843.574008102@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200111094835.417654274@linuxfoundation.org> References: <20200111094835.417654274@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dan Carpenter commit df66499a1fab340c167250a5743931dc50d5f0fa upstream. We used to take a lock in amp_physical_cfm() but then we moved it to the caller function. Unfortunately the unlock on this error path was overlooked so it leads to a double unlock. Fixes: a514b17fab51 ("Bluetooth: Refactor locking in amp_physical_cfm") Signed-off-by: Dan Carpenter Signed-off-by: Marcel Holtmann Signed-off-by: Greg Kroah-Hartman --- net/bluetooth/l2cap_core.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -4897,10 +4897,8 @@ void __l2cap_physical_cfm(struct l2cap_c BT_DBG("chan %p, result %d, local_amp_id %d, remote_amp_id %d", chan, result, local_amp_id, remote_amp_id); - if (chan->state == BT_DISCONN || chan->state == BT_CLOSED) { - l2cap_chan_unlock(chan); + if (chan->state == BT_DISCONN || chan->state == BT_CLOSED) return; - } if (chan->state != BT_CONNECTED) { l2cap_do_create(chan, result, local_amp_id, remote_amp_id);