Received-SPF: pass (google.com: domain of linux-bluetooth+bounces-5219-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Precedence: bulk
MIME-Version: 1.0
References: <CAGew7BttU+g40uRnSCN5XmbXs1KX1ZBbz+xyXC_nw5p4dR2dGA@mail.gmail.com>
 <ad69720e0ba720209cb04240fbc3c5ff059accbc.1717945321.git.pav@iki.fi>
In-Reply-To: <ad69720e0ba720209cb04240fbc3c5ff059accbc.1717945321.git.pav@iki.fi>
From: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
Date: Sun, 9 Jun 2024 13:41:10 -0400
Message-ID: <CABBYNZ+HNjgBSnbEe0m-BSqMdJBQGsOz0NjjqkjhNPcGVtYaSw@mail.gmail.com>
Subject: Re: [PATCH v2] Bluetooth: fix connection setup in l2cap_connect
To: Pauli Virtanen <pav@iki.fi>
Cc: linux-bluetooth@vger.kernel.org, luiz.von.dentz@intel.com, 
	der.timosch@gmail.com
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

Hi Pauli,

On Sun, Jun 9, 2024 at 11:06=E2=80=AFAM Pauli Virtanen <pav@iki.fi> wrote:
>
> The amp_id argument of l2cap_connect() was removed in
> commit 84a4bb6548a2 ("Bluetooth: HCI: Remove HCI_AMP support")
>
> It was always called with amp_id =3D=3D 0, i.e. AMP_ID_BREDR =3D=3D 0x00 =
(ie.
> non-AMP controller).  In the above commit, the code path for amp_id !=3D =
0
> was preserved, although it should have used the amp_id =3D=3D 0 one.
>
> Restore the previous behavior of the non-AMP code path, to fix problems
> with L2CAP connections.

While at it we could create a test case to cover this code path with
l2cap-tester.

> Fixes: 84a4bb6548a2 ("Bluetooth: HCI: Remove HCI_AMP support")
> Signed-off-by: Pauli Virtanen <pav@iki.fi>
> ---
>
> Notes:
>     v2: do the change in the actually right if branch
>
>     Tried proofreading the commit, and this part seemed suspicious.
>     Can you try if this fixes the problem?
>
>  net/bluetooth/l2cap_core.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
> index c49e0d4b3c0d..aed025734d04 100644
> --- a/net/bluetooth/l2cap_core.c
> +++ b/net/bluetooth/l2cap_core.c
> @@ -4011,8 +4011,8 @@ static void l2cap_connect(struct l2cap_conn *conn, =
struct l2cap_cmd_hdr *cmd,
>                                 status =3D L2CAP_CS_AUTHOR_PEND;
>                                 chan->ops->defer(chan);
>                         } else {
> -                               l2cap_state_change(chan, BT_CONNECT2);
> -                               result =3D L2CAP_CR_PEND;
> +                               l2cap_state_change(chan, BT_CONFIG);
> +                               result =3D L2CAP_CR_SUCCESS;
>                                 status =3D L2CAP_CS_NO_INFO;
>                         }
>                 } else {
> --
> 2.45.2
>
>


--=20
Luiz Augusto von Dentz