Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 9DE8251AEF8; Thu, 17 Sep 2026 17:15:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789665318; cv=none; b=RL6We2Pr72wHxsBktUpMmNeB5Zbw2JQL29uInSp5Va4g+k5nqSeY+1rrp42jLluNSYrIFqWUdKbXHb31aZcAz2ksUofcgfY1TwVtX7fgae3UFHVB5Jl+UHbC/KK3yaJGsD46S8881soE3oFDYCBcntzyaEmLW1gZ43kY9OMppsE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789665318; c=relaxed/simple; bh=Q2Fbimdr21RiU2L3aHZhyXjETKb0s9udn72DabH+O50=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gY2IELUYMjD8Z/sJflBMUkZNiN+BB+3aPGZ1STkRopEUsNC4r4OZ4kpp5z8PxQykYVAh1kVzb9F9BFTZi4K4Hz9Oa9xqug9zHsuRMZv/k50j6vYnE9FGlswvJjVGxB2GNjsOqYwJMT6dEhZANHTt6nH1EYg0Hszi32WOQUkXlTY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=FPru3lrR; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="FPru3lrR" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E74411F000FF; Thu, 17 Sep 2026 17:15:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789665317; bh=v6KFJCOWDOxOC/Svn4croOuA/5SoCH6Z99myEp/fv5g=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=FPru3lrRkjpqHJNGmO0UJQCIdtrKz2oKN9lsrmGQYi78t6xpXkG7DDbjJA9ZjQtbJ oLImpfbZh30U1Ds3PWsMIZempw1GVjO3YrGEEV4bU2X+uoViHgPTM6qRDb2kVDAITB qev/+XfBAcZIwns9yZcCVkTDFMsPHd+Xzl3XgLCw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Pauli Virtanen , Luiz Augusto von Dentz , Sasha Levin Subject: [PATCH 6.18 0666/1250] Bluetooth: L2CAP: clear FLAG_DEFER_SETUP only for same PID/PSM Date: Thu, 17 Sep 2026 16:07:41 +0100 Message-ID: <20260917151609.941318036@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260917151551.901433442@linuxfoundation.org> References: <20260917151551.901433442@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Pauli Virtanen [ Upstream commit 0d77683237270702fa93489ca759c89b4e970554 ] l2cap_ecred_defer_connect() clears FLAG_DEFER_SETUP also for channels with different PID/PSM, which will not be added to the same ECRED_CONN_REQ in any case. Consequently, only one ECRED connection group can work at a time although it appears intended they would be separate for each PID/PSM combination. Fix by clearing FLAG_DEFER_SETUP only for the connections that could be added in the request. Retain test_bit(FLAG_DEFER_SETUP) before calling get_peer_pid as it may be NULL otherwise. Fixes: da49b602f7f7 ("Bluetooth: L2CAP: Use DEFER_SETUP to group ECRED connections") Signed-off-by: Pauli Virtanen Signed-off-by: Luiz Augusto von Dentz Signed-off-by: Sasha Levin --- net/bluetooth/l2cap_core.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index fc74e9fad08f7..9365a98107f2d 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -1355,7 +1355,7 @@ static void l2cap_ecred_defer_connect(struct l2cap_chan *chan, void *data) if (chan == conn->chan) return; - if (!test_and_clear_bit(FLAG_DEFER_SETUP, &chan->flags)) + if (!test_bit(FLAG_DEFER_SETUP, &chan->flags)) return; pid = chan->ops->get_peer_pid(chan); @@ -1365,6 +1365,9 @@ static void l2cap_ecred_defer_connect(struct l2cap_chan *chan, void *data) chan->mode != L2CAP_MODE_EXT_FLOWCTL || chan->state != BT_CONNECT) return; + if (!test_and_clear_bit(FLAG_DEFER_SETUP, &chan->flags)) + return; + if (test_and_set_bit(FLAG_ECRED_CONN_REQ_SENT, &chan->flags)) return; -- 2.53.0