Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01447e9f authored by Zhao Junwang's avatar Zhao Junwang Committed by Daniel Vetter
Browse files

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: default avatarZhao Junwang <zhjwpku@gmail.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 41315b79

drivers/gpu/drm/drm_crtc.c

+5 −2
Original line number Original line Diff line number Diff line
@@ -2706,8 +2706,11 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data, 
	if (!drm_core_check_feature(dev, DRIVER_MODESET))

	if (!drm_core_check_feature(dev, DRIVER_MODESET))

		return -EINVAL;

		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;

		return -ERANGE;





	drm_modeset_lock_all(dev);

	drm_modeset_lock_all(dev);