summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorZhao Junwang <zhjwpku@gmail.com>2015-07-07 17:08:35 +0800
committerDaniel Vetter <daniel.vetter@ffwll.ch>2015-07-07 14:05:12 +0200
commit01447e9f04ba1c49a9534ae6a5a6f26c2bb05226 (patch)
tree73c261984d099bfe5eb37d4236a32d3938e46e10 /drivers/gpu
parent41315b793e13f884cda79389f0d5d44d027e57d1 (diff)
downloadop-kernel-dev-01447e9f04ba1c49a9534ae6a5a6f26c2bb05226.zip
op-kernel-dev-01447e9f04ba1c49a9534ae6a5a6f26c2bb05226.tar.gz
drm: add a check for x/y in drm_mode_setcrtc
legacy setcrtc ioctl does take a 32 bit value which might indeed overflow the checks of crtc_req->x > INT_MAX and crtc_req->y > INT_MAX aren't needed any more with this v2: -polish the annotation according to Daniel's comment Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Zhao Junwang <zhjwpku@gmail.com> Cc: stable@vger.kernel.org Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/drm_crtc.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index b9ba061..357bd04 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -2706,8 +2706,11 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data,
if (!drm_core_check_feature(dev, DRIVER_MODESET))
return -EINVAL;
- /* For some reason crtc x/y offsets are signed internally. */
- if (crtc_req->x > INT_MAX || crtc_req->y > INT_MAX)
+ /*
+ * Universal plane src offsets are only 16.16, prevent havoc for
+ * drivers using universal plane code internally.
+ */
+ if (crtc_req->x & 0xffff0000 || crtc_req->y & 0xffff0000)
return -ERANGE;
drm_modeset_lock_all(dev);
OpenPOWER on IntegriCloud