Skip to contentSkip to conversation

drm/nouveau: fix reversed error cleanup order in ucopy functions

PATCH Applied Junrui Luo 2 participants 2 messages Jun 10 – Jun 21

Subsystems (4)
lore
Share & tools
lore

Junrui Luo

author
#0 lore raw

PATCH 1/1 drm/nouveau: fix reversed error cleanup order in ucopy functions

nouveau_uvmm_vm_bind_ucopy() and nouveau_exec_ucopy() place their error cleanup labels in allocation order rather than reverse allocation order. On a u_memcpya() failure for in_sync.s, the goto to err_free_ops (or err_free_pushs) frees the first allocation and then falls through to err_free_ins, which calls u_free() on args->in_sync.s.

Since args->in_sync.s still holds the ERR_PTR returned by the failed u_memcpya(), and ERR_PTR values are not caught by ZERO_OR_NULL_PTR(), kvfree() proceeds to dereference it, which can result in a kernel oops. A failure for out_sync.s instead jumps to err_free_ins and skips freeing the first allocation, leading to a memory leak.

Fix by swapping the cleanup label order so resources are freed in the correct reverse allocation sequence.

Fixes b88baab82871 ("drm/nouveau: implement new VM_BIND uAPI")
---
 drivers/gpu/drm/nouveau/nouveau_exec.c | 4 ++--
 drivers/gpu/drm/nouveau/nouveau_uvmm.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/nouveau/nouveau_exec.c +2 -2
index c01a01aee32b..a08ab1cfea9b 100644
@@ -331,10 +331,10 @@ nouveau_exec_ucopy(struct nouveau_exec_job_args *args,
 
 	return 0;
 
-err_free_pushs:
-	u_free(args->push.s);
 err_free_ins:
 	u_free(args->in_sync.s);
+err_free_pushs:
+	u_free(args->push.s);
 	return ret;
 }
 
drivers/gpu/drm/nouveau/nouveau_uvmm.c +2 -2
index 36445915aa58..f5e4756b4de4 100644
@@ -1779,10 +1779,10 @@ nouveau_uvmm_vm_bind_ucopy(struct nouveau_uvmm_bind_job_args *args,
 
 	return 0;
 
-err_free_ops:
-	u_free(args->op.s);
 err_free_ins:
 	u_free(args->in_sync.s);
+err_free_ops:
+	u_free(args->op.s);
 	return ret;
 }
 

---
base-commit: ddd664bbff63e09e7a7f9acae9c43605d4cf185f
change-id: 20260608-fixes-cb491288eb71

Best regards,

Signature · 1 line
Junrui Luo <[email protected]>
maintainer Applied
#1 lore raw
Quoted 1 line · Junrui Luo

[PATCH] drm/nouveau: fix reversed error cleanup order in ucopy functions

Applied, thanks!

Branch: drm-misc-fixes
Tree: https://gitlab.freedesktop.org/drm/misc/kernel.git

[1/1] drm/nouveau: fix reversed error cleanup order in ucopy functions

      commit: ab99ead646b1

The patch will appear in the next linux-next integration (typically within 24 hours on weekdays).

The patch is queued up for Linus's tree and should land in the next -rc release.