Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 20943f98 authored by Matthew Auld's avatar Matthew Auld Committed by Joonas Lahtinen
Browse files

drm/i915/userptr: reject zero user_size 



Operating on a zero sized GEM userptr object will lead to explosions.

Fixes: 5cc9ed4b ("drm/i915: Introduce mapping of user pages into video memory (userptr) ioctl")
Testcase: igt/gem_userptr_blits/input-checking
Signed-off-by: default avatarMatthew Auld <matthew.auld@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20180502195021.30900-1-matthew.auld@intel.com


(cherry picked from commit c11c7bfd)
Signed-off-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
parent 67b8d5c7

drivers/gpu/drm/i915/i915_gem_userptr.c

+3 −0
Original line number Diff line number Diff line
@@ -778,6 +778,9 @@ i915_gem_userptr_ioctl(struct drm_device *dev, 
			    I915_USERPTR_UNSYNCHRONIZED))

		return -EINVAL;



	if (!args->user_size)

		return -EINVAL;



	if (offset_in_page(args->user_ptr | args->user_size))

		return -EINVAL;