From patchwork Sat Jan 11 09:49:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 234183 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 EB30EC33C9E for ; Sat, 11 Jan 2020 10:01:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C079C2077C for ; Sat, 11 Jan 2020 10:01:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578736862; bh=R4b/CKHP7JvZDV66qTaF7d//2d8ksi5dmX0LRaHr1z8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=r0PfMikDNJ7/HuwZe/iS3fEk7cfiAlRXQ1rfqZW0lo160zFcyyYtdGWKXb7B9X+ve cz4dImsv0pg/8TEBaEHRKJfR7gLy6+sSaTyg2Qu9B4nRZ+xYA8bFe7ukGtZm6vMpAe Su4D3tmgaZggPRsOGYSio2sTMJ52cP4/rrSP+7vk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729255AbgAKKBC (ORCPT ); Sat, 11 Jan 2020 05:01:02 -0500 Received: from mail.kernel.org ([198.145.29.99]:58030 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729064AbgAKKBB (ORCPT ); Sat, 11 Jan 2020 05:01:01 -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 0D59C2082E; Sat, 11 Jan 2020 10:00:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578736860; bh=R4b/CKHP7JvZDV66qTaF7d//2d8ksi5dmX0LRaHr1z8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=i6xZS+3ZHK70M3t2t+TM0n1QnLVYxETSN+w5zv9KLzUfHwt/ccgfE/mVnQCr1l+KU e41/DfpCujqHdKml3I6s0lxpmWmaUzQVTw261ezLrsyuQ96NCsywRXYMiiLCDHQ37j jmv97sjG455jMJHXNIXWOph/kfPoCEJ5kcabUcaU= 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.9 38/91] Bluetooth: delete a stray unlock Date: Sat, 11 Jan 2020 10:49:31 +0100 Message-Id: <20200111094859.385467870@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200111094844.748507863@linuxfoundation.org> References: <20200111094844.748507863@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 @@ -4908,10 +4908,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);