Skip to contentSkip to conversation

drm/amdkfd: CRIU return -EFAULT for copy_to_user() failure

PATCH In review Dan Carpenter 2 participants 2 messages Feb 9, 2022

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/amdkfd: CRIU return -EFAULT for copy_to_user() failure

If copy_to_user() fails, it returns the number of bytes remaining to be copied but we want to return a negative error code (-EFAULT) to the user.

Fixes 9d5dabfeff3c ("drm/amdkfd: CRIU Save Shared Virtual Memory ranges")
---
 drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_svm.c +3 -3
index 41f03d165bad..38a056fd0966 100644
@@ -3775,10 +3775,10 @@ int kfd_criu_checkpoint_svm(struct kfd_process *p,
 			goto exit_priv;
 		}
 
-		ret = copy_to_user(user_priv_data + *priv_data_offset,
-				   svm_priv, svm_priv_data_size);
-		if (ret) {
+		if (copy_to_user(user_priv_data + *priv_data_offset, svm_priv,
+				 svm_priv_data_size)) {
 			pr_err("Failed to copy svm priv to user\n");
+			ret = -EFAULT;
 			goto exit_priv;
 		}
 
Signature · 1 line
2.20.1
maintainer
#1 lore raw
Quoted 6 lines · Dan Carpenter

If copy_to_user() fails, it returns the number of bytes remaining to be copied but we want to return a negative error code (-EFAULT) to the user.

Fixes 9d5dabfeff3c ("drm/amdkfd: CRIU Save Shared Virtual Memory ranges")

Thank you Dan. I'm applying your two patches to amd-staging-drm-next.

Regards,
  Felix

Quoted 22 lines
---
  drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_svm.c +3 -3
index 41f03d165bad..38a056fd0966 100644
@@ -3775,10 +3775,10 @@ int kfd_criu_checkpoint_svm(struct kfd_process *p,
  			goto exit_priv;
  		}
 
-		ret = copy_to_user(user_priv_data + *priv_data_offset,
-				   svm_priv, svm_priv_data_size);
-		if (ret) {
+		if (copy_to_user(user_priv_data + *priv_data_offset, svm_priv,
+				 svm_priv_data_size)) {
  			pr_err("Failed to copy svm priv to user\n");
+			ret = -EFAULT;
  			goto exit_priv;
  		}