Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0ABBE10E4 for ; Mon, 24 Jul 2023 01:34:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 42F6BC433C7; Mon, 24 Jul 2023 01:34:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1690162456; bh=NFfT96HskUNUd6UDCjplWewtb3AWg0d2uV1CnZ+9fLQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CemstGoOcXnUxFjSDnqLe8m+qKEv9ooT8hB+a5nA87MDaZKxqjSac0XBzTGyA7v0c 62KhI/LcrKcC3PCvdwa/3Z8zLn3ICk2SEhwIQUd/zxSCKDl6xr8kT9LS5nlF+hBaSP BKb+mMlcORAwHKJC6EmsVXU6WfInrHEjTEQEBYnytL5lMPCzH3FGH3nsh3p25zU/LL O4toETkV53JVMdOP1sBxHGWWCBLNayEnyvO9lAJotb8NIRMDpkhpT0Tq0SxmyxmJH8 lORsqJKKCo316/RZRydA38tEHffo3S+ilW8GAG2dHJszX+q8gTJ6tjqQdWs2rs03Fe wjAZ++7Nb/g2w== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Zhengping Jiang , Luiz Augusto von Dentz , Jakub Kicinski , Sasha Levin , marcel@holtmann.org, gustavo@padovan.org, johan.hedberg@gmail.com, davem@davemloft.net, linux-bluetooth@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.10 10/16] Bluetooth: L2CAP: Fix use-after-free Date: Sun, 23 Jul 2023 21:33:54 -0400 Message-Id: <20230724013401.2333159-10-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230724013401.2333159-1-sashal@kernel.org> References: <20230724013401.2333159-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.10.186 Content-Transfer-Encoding: 8bit From: Zhengping Jiang [ Upstream commit f752a0b334bb95fe9b42ecb511e0864e2768046f ] Fix potential use-after-free in l2cap_le_command_rej. Signed-off-by: Zhengping Jiang Signed-off-by: Luiz Augusto von Dentz Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/bluetooth/l2cap_core.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index 568f0f072b3df..7b40e4737a2bb 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -6370,9 +6370,14 @@ static inline int l2cap_le_command_rej(struct l2cap_conn *conn, if (!chan) goto done; + chan = l2cap_chan_hold_unless_zero(chan); + if (!chan) + goto done; + l2cap_chan_lock(chan); l2cap_chan_del(chan, ECONNREFUSED); l2cap_chan_unlock(chan); + l2cap_chan_put(chan); done: mutex_unlock(&conn->chan_lock); -- 2.39.2