diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2011-12-20 00:06:44 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-12-20 10:04:27 +0000 |
| commit | 42ef87896adeb3116835a1e88abab84dafc1912d (patch) | |
| tree | e5609ed1ad714b7d4d18a55cbeec618ea018d3da /drivers/gpu/drm/drm_crtc.c | |
| parent | e5e3b44c676be2dac97efd94e581e14a073e4ca7 (diff) | |
| download | linux-3.10-42ef87896adeb3116835a1e88abab84dafc1912d.tar.gz linux-3.10-42ef87896adeb3116835a1e88abab84dafc1912d.tar.bz2 linux-3.10-42ef87896adeb3116835a1e88abab84dafc1912d.zip | |
drm: plane: Check source coordinates
Make sure the source coordinates stay within the buffer.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/drm_crtc.c')
| -rw-r--r-- | drivers/gpu/drm/drm_crtc.c | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index d9bf9d88ff4..1242e121e4a 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -1661,6 +1661,7 @@ int drm_mode_setplane(struct drm_device *dev, void *data, struct drm_crtc *crtc; struct drm_framebuffer *fb; int ret = 0; + unsigned int fb_width, fb_height; if (!drm_core_check_feature(dev, DRIVER_MODESET)) return -EINVAL; @@ -1709,6 +1710,28 @@ int drm_mode_setplane(struct drm_device *dev, void *data, } fb = obj_to_fb(obj); + fb_width = fb->width << 16; + fb_height = fb->height << 16; + + /* Make sure source coordinates are inside the fb. */ + if (plane_req->src_w > fb_width || + plane_req->src_x > fb_width - plane_req->src_w || + plane_req->src_h > fb_height || + plane_req->src_y > fb_height - plane_req->src_h) { + DRM_DEBUG_KMS("Invalid source coordinates " + "%u.%06ux%u.%06u+%u.%06u+%u.%06u\n", + plane_req->src_w >> 16, + ((plane_req->src_w & 0xffff) * 15625) >> 10, + plane_req->src_h >> 16, + ((plane_req->src_h & 0xffff) * 15625) >> 10, + plane_req->src_x >> 16, + ((plane_req->src_x & 0xffff) * 15625) >> 10, + plane_req->src_y >> 16, + ((plane_req->src_y & 0xffff) * 15625) >> 10); + ret = -ENOSPC; + goto out; + } + ret = plane->funcs->update_plane(plane, crtc, fb, plane_req->crtc_x, plane_req->crtc_y, plane_req->crtc_w, plane_req->crtc_h, |