| Message ID | 1465993109-19523-30-git-send-email-chris@chris-wilson.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 15/06/16 13:18, Chris Wilson wrote: > The GETPARAM ioctl writes to a user supplied address. If that address is > invalid, it is the user's error and not the driver's, so quietly report > EFAULT and don't blame ourselves with a DRM_ERROR. > > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> > --- > drivers/gpu/drm/i915/i915_drv.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c > index 6104ff2f6666..31f6363d6135 100644 > --- a/drivers/gpu/drm/i915/i915_drv.c > +++ b/drivers/gpu/drm/i915/i915_drv.c > @@ -752,10 +752,8 @@ static int i915_getparam(struct drm_device *dev, void *data, > return -EINVAL; > } > > - if (copy_to_user(param->value, &value, sizeof(int))) { > - DRM_ERROR("copy_to_user failed\n"); > + if (put_user(value, param->value)) > return -EFAULT; > - } > > return 0; > } > Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Regards, Tvrtko
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 6104ff2f6666..31f6363d6135 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -752,10 +752,8 @@ static int i915_getparam(struct drm_device *dev, void *data, return -EINVAL; } - if (copy_to_user(param->value, &value, sizeof(int))) { - DRM_ERROR("copy_to_user failed\n"); + if (put_user(value, param->value)) return -EFAULT; - } return 0; }
The GETPARAM ioctl writes to a user supplied address. If that address is invalid, it is the user's error and not the driver's, so quietly report EFAULT and don't blame ourselves with a DRM_ERROR. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> --- drivers/gpu/drm/i915/i915_drv.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)