From b679cbeef3b99a6ec06249d4be641ebab7474ce5 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Tue, 18 Oct 2011 09:09:19 +0300 Subject: [PATCH] --- yaml --- r: 269777 b: refs/heads/master c: d2c184fb10656f2a6d59fef76efb3a8b12fb6ed4 h: refs/heads/master i: 269775: 3f52518f322240bc14c607a9a4caca2bbe95423e v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a32bb5e66b09..0c3188fac2a3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bd8315c4a8ade3c0cd6c1933ae6e453958397d22 +refs/heads/master: d2c184fb10656f2a6d59fef76efb3a8b12fb6ed4 diff --git a/trunk/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c b/trunk/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c index 97f23abeacda..3f6343502d1f 100644 --- a/trunk/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c +++ b/trunk/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c @@ -150,6 +150,7 @@ int vmw_present_ioctl(struct drm_device *dev, void *data, ret = copy_from_user(clips, clips_ptr, num_clips * sizeof(*clips)); if (ret) { DRM_ERROR("Failed to copy clip rects from userspace.\n"); + ret = -EFAULT; goto out_no_copy; } @@ -241,6 +242,7 @@ int vmw_present_readback_ioctl(struct drm_device *dev, void *data, ret = copy_from_user(clips, clips_ptr, num_clips * sizeof(*clips)); if (ret) { DRM_ERROR("Failed to copy clip rects from userspace.\n"); + ret = -EFAULT; goto out_no_copy; }