Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20220520183713.2641513-1-luiz.dentz@gmail.com>
 <148a9f76-0784-1d17-22cd-80343895aa37@pengutronix.de> <9e5b51ae-5089-dc91-57cb-52b0d76249d8@pengutronix.de>
 <CABBYNZ+DNOvguwKXie+1NVJ6xQjOYQiUCroBcBNEyUuKjt2+_Q@mail.gmail.com> <f5730712-1967-9d1b-3e04-9fcb6b4a3070@pengutronix.de>
In-Reply-To: <f5730712-1967-9d1b-3e04-9fcb6b4a3070@pengutronix.de>
From:   Luiz Augusto von Dentz <luiz.dentz@gmail.com>
Date:   Tue, 24 May 2022 16:44:19 -0700
Message-ID: <CABBYNZJpgsZnGuJDJ4GyQm=_kJ8xgJJ=gorE9PXmwzCv3YcsUA@mail.gmail.com>
Subject: Re: [PATCH-stable] Bluetooth: hci_conn: Fix hci_connect_le_sync
To:     Ahmad Fatoum <a.fatoum@pengutronix.de>
Cc:     "linux-bluetooth@vger.kernel.org" <linux-bluetooth@vger.kernel.org>,
        Pengutronix Kernel Team <kernel@pengutronix.de>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

Hi Ahmad,

On Tue, May 24, 2022 at 3:01 PM Ahmad Fatoum <a.fatoum@pengutronix.de> wrote:
>
> Hello Luiz,
>
> On 24.05.22 20:08, Luiz Augusto von Dentz wrote:
> > On Tue, May 24, 2022 at 8:55 AM Ahmad Fatoum <a.fatoum@pengutronix.de> wrote:
> >> On 24.05.22 16:48, Ahmad Fatoum wrote:
> >> I see now that this fix doesn't build for v5.17 because hci_conn_failed
> >> was only introduced in v5.18. Can the hci_conn.c hunk be safely dropped?
> >
> > Are you talking about:
> >
> >         if (status) {
> > -               hci_le_conn_failed(conn, status);
> > +               hci_conn_failed(conn, status);
> >                 goto unlock;
> >         }
> >
> > You just need to replace hci_conn_failed with hci_le_conn_failed or
> > well in the code above the end result is the same since it is not
> > supposed to cleanup in the event handler.
>
> Yes, that cleanup in le_conn_complete_evt() needs to be removed.
> I am talking about the other hunk in hci_conn.c:
>
>   -    if (!conn)
>   +    /* Check if connection is still pending */
>   +    if (conn != hci_lookup_le_connect(hdev))
>                goto done;
>
>    -    hci_le_conn_failed(conn, err);
>    +    hci_conn_failed(conn, err);
>
>     done:
>         hci_dev_unlock(hdev);
>
>
> Can this be dropped for v5.17?

I guess it should be alright but perhaps keep if (conn !=
hci_lookup_le_connect(hdev)) just in case.

> Cheers,
> Ahmad
>
> --
> Pengutronix e.K.                           |                             |
> Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
> 31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
> Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |


-- 
Luiz Augusto von Dentz