5.4-stable patches

added patches:
	drm-nouveau-fix-bad-ret-code-in-nouveau_bo_move_prep.patch

diff --git a/queue-5.4/drm-nouveau-fix-bad-ret-code-in-nouveau_bo_move_prep.patch b/queue-5.4/drm-nouveau-fix-bad-ret-code-in-nouveau_bo_move_prep.patch
new file mode 100644 (file)
index 0000000..01b3873
--- /dev/null
+++ b/queue-5.4/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 <sfual@cse.ust.hk>
+Date: Wed, 8 Oct 2025 00:17:09 +0800
+Subject: drm/nouveau: fix bad ret code in nouveau_bo_move_prep
+
+From: Shuhao Fu <sfual@cse.ust.hk>
+
+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 <pvorel@suse.cz>
+Signed-off-by: Shuhao Fu <sfual@cse.ust.hk>
+Fixes: 9ce523cc3bf2 ("drm/nouveau: separate buffer object backing memory from nvkm structures")
+Signed-off-by: Danilo Krummrich <dakr@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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
+@@ -1122,7 +1122,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.4/series b/queue-5.4/series
index e99253b16591d5d4310fa215ec8d08c45881f97a..a38f27c0aae45e501c6fb115548341631de1fc7b 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -104,3 +104,4 @@ arm64-dts-qcom-msm8916-add-missing-mdss-reset.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