Commit e3885f71 authored by Dave Airlie's avatar Dave Airlie Committed by Danilo Krummrich
Browse files

nouveau/u_memcpya: use vmemdup_user 



I think there are limit checks in place for most things but the
new uAPI wants to not have them.

Add a limit check and use the vmemdup_user helper instead.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
Reviewed-by: default avatarDanilo Krummrich <dakr@redhat.com>
Signed-off-by: default avatarDanilo Krummrich <dakr@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230810185020.231135-1-airlied@gmail.com
parent 31499b01

drivers/gpu/drm/nouveau/nouveau_drv.h

+5 −14
Original line number Diff line number Diff line
@@ -189,21 +189,12 @@ u_free(void *addr) 
static inline void *

u_memcpya(uint64_t user, unsigned int nmemb, unsigned int size)

{

	void *mem;

	void __user *userptr = (void __force __user *)(uintptr_t)user;

	void __user *userptr = u64_to_user_ptr(user);

	size_t bytes;



	size *= nmemb;



	mem = kvmalloc(size, GFP_KERNEL);

	if (!mem)

		return ERR_PTR(-ENOMEM);



	if (copy_from_user(mem, userptr, size)) {

		u_free(mem);

		return ERR_PTR(-EFAULT);

	}



	return mem;

	if (unlikely(check_mul_overflow(nmemb, size, &bytes)))

		return NULL;

	return vmemdup_user(userptr, bytes);

}



#include <nvif/object.h>