Commit 6156c101 authored by Thorsten Blum's avatar Thorsten Blum Committed by Alex Deucher
Browse files

drm/amdkfd: Replace kzalloc + copy_from_user with memdup_user 



Replace kzalloc() followed by copy_from_user() with memdup_user() to
improve and simplify kfd_ioctl_set_cu_mask().

Return early if an error occurs and remove the obsolete 'out' label.

No functional changes intended.

Signed-off-by: default avatarThorsten Blum <thorsten.blum@linux.dev>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent d4b6274c

drivers/gpu/drm/amd/amdkfd/kfd_chardev.c

+3 −9
Original line number Diff line number Diff line
@@ -521,15 +521,10 @@ static int kfd_ioctl_set_cu_mask(struct file *filp, struct kfd_process *p, 
		cu_mask_size = sizeof(uint32_t) * (max_num_cus/32);

	}



	minfo.cu_mask.ptr = kzalloc(cu_mask_size, GFP_KERNEL);

	if (!minfo.cu_mask.ptr)

		return -ENOMEM;



	retval = copy_from_user(minfo.cu_mask.ptr, cu_mask_ptr, cu_mask_size);

	if (retval) {

	minfo.cu_mask.ptr = memdup_user(cu_mask_ptr, cu_mask_size);

	if (IS_ERR(minfo.cu_mask.ptr)) {

		pr_debug("Could not copy CU mask from userspace");

		retval = -EFAULT;

		goto out;

		return PTR_ERR(minfo.cu_mask.ptr);

	}



	mutex_lock(&p->mutex);
@@ -538,7 +533,6 @@ static int kfd_ioctl_set_cu_mask(struct file *filp, struct kfd_process *p, 


	mutex_unlock(&p->mutex);



out:

	kfree(minfo.cu_mask.ptr);

	return retval;

}