From: Greg Kroah-Hartman Date: Thu, 16 Oct 2025 09:33:40 +0000 (+0200) Subject: 5.10-stable patches X-Git-Tag: v5.15.195~92 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=26a69b205bdca7225b9d560697b41b71a2c739a5;p=thirdparty%2Fkernel%2Fstable-queue.git 5.10-stable patches added patches: drm-nouveau-fix-bad-ret-code-in-nouveau_bo_move_prep.patch --- diff --git a/queue-5.10/drm-nouveau-fix-bad-ret-code-in-nouveau_bo_move_prep.patch b/queue-5.10/drm-nouveau-fix-bad-ret-code-in-nouveau_bo_move_prep.patch new file mode 100644 index 0000000000..514376fc66 --- /dev/null +++ b/queue-5.10/drm-nouveau-fix-bad-ret-code-in-nouveau_bo_move_prep.patch @@ -0,0 +1,34 @@ +From e4bea919584ff292c9156cf7d641a2ab3cbe27b0 Mon Sep 17 00:00:00 2001 +From: Shuhao Fu +Date: Wed, 8 Oct 2025 00:17:09 +0800 +Subject: drm/nouveau: fix bad ret code in nouveau_bo_move_prep + +From: Shuhao Fu + +commit e4bea919584ff292c9156cf7d641a2ab3cbe27b0 upstream. + +In `nouveau_bo_move_prep`, if `nouveau_mem_map` fails, an error code +should be returned. Currently, it returns zero even if vmm addr is not +correctly mapped. + +Cc: stable@vger.kernel.org +Reviewed-by: Petr Vorel +Signed-off-by: Shuhao Fu +Fixes: 9ce523cc3bf2 ("drm/nouveau: separate buffer object backing memory from nvkm structures") +Signed-off-by: Danilo Krummrich +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/nouveau/nouveau_bo.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/gpu/drm/nouveau/nouveau_bo.c ++++ b/drivers/gpu/drm/nouveau/nouveau_bo.c +@@ -796,7 +796,7 @@ done: + nvif_vmm_put(vmm, &old_mem->vma[1]); + nvif_vmm_put(vmm, &old_mem->vma[0]); + } +- return 0; ++ return ret; + } + + static int diff --git a/queue-5.10/series b/queue-5.10/series index 85ce4b640e..7a3298e862 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -133,3 +133,4 @@ xen-events-cleanup-find_virq-return-codes.patch xen-manage-fix-suspend-error-path.patch firmware-meson_sm-fix-device-leak-at-probe.patch media-i2c-mt9v111-fix-incorrect-type-for-ret.patch +drm-nouveau-fix-bad-ret-code-in-nouveau_bo_move_prep.patch