This is a note to let you know that I've just added the patch titled
drm/nouveau: fix stale locked mutex in nouveau_gem_ioctl_pushbuf
to the 6.6-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:
drm-nouveau-fix-stale-locked-mutex-in-nouveau_gem_ioctl_pushbuf.patch
and it can be found in the queue-6.6 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From daf8739c3322a762ce84f240f50e0c39181a41ab Mon Sep 17 00:00:00 2001
From: Karol Herbst <kherbst@xxxxxxxxxx>
Date: Tue, 5 Mar 2024 14:38:52 +0100
Subject: drm/nouveau: fix stale locked mutex in nouveau_gem_ioctl_pushbuf
From: Karol Herbst <kherbst@xxxxxxxxxx>
commit daf8739c3322a762ce84f240f50e0c39181a41ab upstream.
If VM_BIND is enabled on the client the legacy submission ioctl can't be
used, however if a client tries to do so regardless it will return an
error. In this case the clients mutex remained unlocked leading to a
deadlock inside nouveau_drm_postclose or any other nouveau ioctl call.
Fixes: b88baab82871 ("drm/nouveau: implement new VM_BIND uAPI")
Cc: Danilo Krummrich <dakr@xxxxxxxxxx>
Cc: <stable@xxxxxxxxxxxxxxx> # v6.6+
Signed-off-by: Karol Herbst <kherbst@xxxxxxxxxx>
Reviewed-by: Lyude Paul <lyude@xxxxxxxxxx>
Reviewed-by: Danilo Krummrich <dakr@xxxxxxxxxx>
Link: https://patchwork.freedesktop.org/patch/msgid/20240305133853.2214268-1-kherbst@xxxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/nouveau/nouveau_gem.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/gpu/drm/nouveau/nouveau_gem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_gem.c
@@ -758,7 +758,7 @@ nouveau_gem_ioctl_pushbuf(struct drm_dev
return -ENOMEM;
if (unlikely(nouveau_cli_uvmm(cli)))
- return -ENOSYS;
+ return nouveau_abi16_put(abi16, -ENOSYS);
list_for_each_entry(temp, &abi16->channels, head) {
if (temp->chan->chid == req->channel) {
Patches currently in stable-queue which might be from kherbst@xxxxxxxxxx are
queue-6.6/drm-nouveau-fix-stale-locked-mutex-in-nouveau_gem_ioctl_pushbuf.patch
