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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6F8D4C4332F for ; Fri, 11 Nov 2022 02:39:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233206AbiKKCji (ORCPT ); Thu, 10 Nov 2022 21:39:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47460 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233197AbiKKCi1 (ORCPT ); Thu, 10 Nov 2022 21:38:27 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CD1536DCF9; Thu, 10 Nov 2022 18:36:11 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 6143C61E92; Fri, 11 Nov 2022 02:36:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 73E87C43144; Fri, 11 Nov 2022 02:36:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1668134170; bh=P4+8hYSYFL7DKnubYdsOqOeQ8PnErQe0hny6ElgUysE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VzbaCQebtiGSPWBiHXVvEGgMvidGmuSNGLjbYPzOrRc3l8mbNc9A49uvXsM0hF7uX cn4lOydvkAKHs8jN0nb9AcGhXGxBXv75vDmttSqFiiD1i7RVrybMcHSCAwZ9PrCD3P azUsNIYiTm8fCg/b36N9ouByetc6zMhe0PQpctfUnmFuSp0FbE2NMsc+cyism7aTY0 E7lhkGU/qhEL8XdJvrtnfVJM4CK9tP8BkEWLMScXSSkYp04XW1KRGqtAD4KjSeQWbz DAoCy2exH4PYa8JDjqyme74hkKzN0VUG7MM373jaVtfo2V4M04mGPhdbXyUhylWUur WPzooGY4Wnh5w== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Luiz Augusto von Dentz , Tedd Ho-Jeong An , Sasha Levin , marcel@holtmann.org, johan.hedberg@gmail.com, luiz.dentz@gmail.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, linux-bluetooth@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 2/2] Bluetooth: L2CAP: Fix l2cap_global_chan_by_psm Date: Thu, 10 Nov 2022 21:36:05 -0500 Message-Id: <20221111023605.228202-2-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221111023605.228202-1-sashal@kernel.org> References: <20221111023605.228202-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Luiz Augusto von Dentz [ Upstream commit f937b758a188d6fd328a81367087eddbb2fce50f ] l2cap_global_chan_by_psm shall not return fixed channels as they are not meant to be connected by (S)PSM. Signed-off-by: Luiz Augusto von Dentz Reviewed-by: Tedd Ho-Jeong An Signed-off-by: Sasha Levin --- net/bluetooth/l2cap_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index 652c0723051b..ead6164c4dbd 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -1824,7 +1824,7 @@ static struct l2cap_chan *l2cap_global_chan_by_psm(int state, __le16 psm, if (link_type == LE_LINK && c->src_type == BDADDR_BREDR) continue; - if (c->psm == psm) { + if (c->chan_type != L2CAP_CHAN_FIXED && c->psm == psm) { int src_match, dst_match; int src_any, dst_any; -- 2.35.1