Re: [PATCH 1/2] Bluetooth: ISO: consider right CIS when removing CIG at cleanup

[Luiz Augusto von Dentz <luiz.dentz@xxxxxxxxx>]

Hi Pauli,

On Sun, May 21, 2023 at 8:52 AM Pauli Virtanen <pav@xxxxxx> wrote:
>
> When looking for CIS blocking CIG removal, consider only the CIS with
> the right CIG ID. Don't try to remove CIG with unset CIG ID.

You forgot to add Signed-off-by, also we should probably add Fixes tag
as well since we might want to backport these changes.

> ---
>  net/bluetooth/hci_conn.c | 5 +++++
>  1 file changed, 5 insertions(+)
>
> diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
> index f75ef12f18f7..2363477af89d 100644
> --- a/net/bluetooth/hci_conn.c
> +++ b/net/bluetooth/hci_conn.c
> @@ -950,6 +950,8 @@ static void find_cis(struct hci_conn *conn, void *data)
>         /* Ignore broadcast */
>         if (!bacmp(&conn->dst, BDADDR_ANY))
>                 return;
> +       if (d->cig != conn->iso_qos.ucast.cig)
> +               return;
>
>         d->count++;
>  }
> @@ -963,6 +965,9 @@ static void cis_cleanup(struct hci_conn *conn)
>         struct hci_dev *hdev = conn->hdev;
>         struct iso_list_data d;
>
> +       if (conn->iso_qos.ucast.cig == BT_ISO_QOS_CIG_UNSET)
> +               return;
> +
>         memset(&d, 0, sizeof(d));
>         d.cig = conn->iso_qos.ucast.cig;
>
> --
> 2.40.1
>


-- 
Luiz Augusto von Dentz