Skip to contentSkip to conversation

FAILED: patch "[PATCH] drm/amdkfd: Fix NULL pointer dereference in" failed to apply to 6.0-stable tree

PATCH [email protected] 1 participant 1 message Nov 8, 2022

Subsystems (4)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 6.0-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

Possible dependencies:

5b994354af3c ("drm/amdkfd: Fix NULL pointer dereference in svm_migrate_to_ram()") e1f84eef313f ("drm/amdkfd: handle CPU fault on COW mapping")

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 5b994354af3cab770bf13386469c5725713679af Mon Sep 17 00:00:00 2001
From: Yang Li <[email protected]>
Date: Wed, 26 Oct 2022 10:00:54 +0800
Subject: [PATCH] drm/amdkfd: Fix NULL pointer dereference in
svm_migrate_to_ram()

./drivers/gpu/drm/amd/amdkfd/kfd_migrate.c:985:58-62: ERROR: p is NULL but dereferenced.

drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +1 -3
index 2797029bd500..22b077ac9a19 100644
@@ -973,12 +973,10 @@ static vm_fault_t svm_migrate_to_ram(struct vm_fault *vmf)
 out_unlock_svms:
 	mutex_unlock(&p->svms.lock);
 out_unref_process:
+	pr_debug("CPU fault svms 0x%p address 0x%lx done\n", &p->svms, addr);
 	kfd_unref_process(p);
 out_mmput:
 	mmput(mm);
-
-	pr_debug("CPU fault svms 0x%p address 0x%lx done\n", &p->svms, addr);
-
 	return r ? VM_FAULT_SIGBUS : 0;
 }