Hi Greg, On Tue, Apr 2, 2024 at 3:47 AM Greg KH <gregkh@xxxxxxxxxxxxxxxxxxx> wrote: > > On Mon, Apr 01, 2024 at 04:40:06PM -0400, Luiz Augusto von Dentz wrote: > > Hi Sasha, > > > > On Fri, Mar 22, 2024 at 1:59 PM Sasha Levin <sashal@xxxxxxxxxx> wrote: > > > > > > This is a note to let you know that I've just added the patch titled > > > > > > Bluetooth: hci_core: Cancel request on command timeout > > > > > > to the 6.8-stable tree which can be found at: > > > http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary > > > > > > The filename of the patch is: > > > bluetooth-hci_core-cancel-request-on-command-timeout.patch > > > and it can be found in the queue-6.8 subdirectory. > > > > > > If you, or anyone else, feels it should not be added to the stable tree, > > > please let <stable@xxxxxxxxxxxxxxx> know about it. > > > > > > > > > > > > commit bcb39bf018fb4db5fb7d6c7f5b4eb233ac6d5226 > > > Author: Luiz Augusto von Dentz <luiz.von.dentz@xxxxxxxxx> > > > Date: Tue Jan 9 13:45:40 2024 -0500 > > > > > > Bluetooth: hci_core: Cancel request on command timeout > > > > > > [ Upstream commit 63298d6e752fc0ec7f5093860af8bc9f047b30c8 ] > > > > > > If command has timed out call __hci_cmd_sync_cancel to notify the > > > hci_req since it will inevitably cause a timeout. > > > > > > This also rework the code around __hci_cmd_sync_cancel since it was > > > wrongly assuming it needs to cancel timer as well, but sometimes the > > > timers have not been started or in fact they already had timed out in > > > which case they don't need to be cancel yet again. > > > > > > Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@xxxxxxxxx> > > > Stable-dep-of: 2615fd9a7c25 ("Bluetooth: hci_sync: Fix overwriting request callback") > > > > I don't recall marking this to stable though, not really sure how > > Stable-dep-of was inserted above? > > It was added to show why this patch was added to the tree, it was needed > for a different bugfix. > > > Anyway Id remove this commit from > > stable since we are seeing a lot of problems with it: > > > > https://bugzilla.kernel.org/show_bug.cgi?id=218651 > > This is already in the following released kernels: > 6.1.83 6.6.23 6.7.11 6.8.2 6.9-rc1 > so needs to be fixed in Linus's tree so that we can backport the fix to > the stable trees. > > But I thought that already happened? If the fix was already merged then sorry for the noise, I guess the following already made into Linu's tree then: https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth.git/tag/?h=for-net-2024-03-29 - Bluetooth: hci_sync: Fix not checking error on hci_cmd_sync_cancel_sync > thanks, > > greg k-h -- Luiz Augusto von Dentz
