Skip to content

Commit daf8739

Browse files
committed
drm/nouveau: fix stale locked mutex in nouveau_gem_ioctl_pushbuf
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: b88baab ("drm/nouveau: implement new VM_BIND uAPI") Cc: Danilo Krummrich <dakr@redhat.com> Cc: <stable@vger.kernel.org> # v6.6+ Signed-off-by: Karol Herbst <kherbst@redhat.com> Reviewed-by: Lyude Paul <lyude@redhat.com> Reviewed-by: Danilo Krummrich <dakr@redhat.com> Link: https://patchwork.freedesktop.org/patch/msgid/20240305133853.2214268-1-kherbst@redhat.com
1 parent 9dfc46c commit daf8739

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

drivers/gpu/drm/nouveau/nouveau_gem.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -764,7 +764,7 @@ nouveau_gem_ioctl_pushbuf(struct drm_device *dev, void *data,
764764
return -ENOMEM;
765765

766766
if (unlikely(nouveau_cli_uvmm(cli)))
767-
return -ENOSYS;
767+
return nouveau_abi16_put(abi16, -ENOSYS);
768768

769769
list_for_each_entry(temp, &abi16->channels, head) {
770770
if (temp->chan->chid == req->channel) {

0 commit comments

Comments
 (0)