[PATCH] drm/i915/userptr: reject zero user_size

[PATCH] drm/i915/userptr: reject zero user_size

[Loic]

Hello,

Tested without any problem so please picked up this.

 From: Matthew Auld

[ Upstream commit c11c7bfd213495784b22ef82a69b6489f8d0092f ]

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

Fixes: 5cc9ed4b9a7a ("drm/i915: Introduce mapping of user pages into 
video memory (userptr) ioctl")
Testcase: igt/gem_userptr_blits/input-checking
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: 
https://patchwork.freedesktop.org/patch/msgid/20180502195021.30900-1-matthew.auld@intel.com
---
  drivers/gpu/drm/i915/i915_gem_userptr.c | 3 +++
  1 file changed, 3 insertions(+)

diff --git a/drivers/gpu/drm/i915/i915_gem_userptr.c 
b/drivers/gpu/drm/i915/i915_gem_userptr.c
index d596a8302ca3c..854bd51b9478a 100644
--- a/drivers/gpu/drm/i915/i915_gem_userptr.c
+++ b/drivers/gpu/drm/i915/i915_gem_userptr.c
@@ -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;

-- 
2.17.1

Re: [PATCH] drm/i915/userptr: reject zero user_size

[Greg KH]

On Sun, Sep 02, 2018 at 11:55:52PM +0200, Loic wrote:
> Hello,
> 
> Tested without any problem so please picked up this.

Pick this up for what stable kernel tree(s) exactly?

thanks,

greg k-h

Re: [PATCH] drm/i915/userptr: reject zero user_size

[Loic]

Le 2018-09-03 18:17, Greg KH a écrit :
> On Sun, Sep 02, 2018 at 11:55:52PM +0200, Loic wrote:
>> Hello,
>> 
>> Tested without any problem so please picked up this.
> 
> Pick this up for what stable kernel tree(s) exactly?

Sorry about the lack of detail  For 4.4, 4.9 and 4.14 please.

> thanks,

Thanks to you too.

> 
> greg k-h

-- 
Best regards,

Loic

Re: [PATCH] drm/i915/userptr: reject zero user_size

[Greg KH]

On Mon, Sep 03, 2018 at 09:56:42PM +0200, Loic wrote:
> Le 2018-09-03 18:17, Greg KH a �crit�:
> > On Sun, Sep 02, 2018 at 11:55:52PM +0200, Loic wrote:
> > > Hello,
> > > 
> > > Tested without any problem so please picked up this.
> > 
> > Pick this up for what stable kernel tree(s) exactly?
> 
> Sorry about the lack of detail  For 4.4, 4.9 and 4.14 please.

Now queued up, thanks.

greg k-h