Skip to contentSkip to conversation

drm/amdkfd: Fix NULL pointer dereference in svm_migrate_to_ram()

PATCH Applied Yang Li 2 participants 2 messages Oct 26, 2022

Subsystems (3)
lore
Share & tools
lore

Yang Li

author
#0 lore raw

PATCH 1/1 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.

---

change in v2:
According to Felix's suggestion, move the pr_debug up before the kfd_unref_process call.

 drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +1 -3
index 20d6b2578927..b9c8d29d95aa 100644
@@ -978,12 +978,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;
 }
 
Signature · 1 line
2.20.1.7.g153144c
maintainer Reviewed-by on v1 1/1 Applied
#1 lore raw
Quoted 5 lines · Yang Li

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

The patch is

I applied to our amd-staging-drm-next branch.

Thanks,
  Felix

Quoted 27 lines

---

change in v2:
According to Felix's suggestion, move the pr_debug up before the kfd_unref_process call.

  drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 4 +---
  1 file changed, 1 insertion(+), 3 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +1 -3
index 20d6b2578927..b9c8d29d95aa 100644
@@ -978,12 +978,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;
  }