Commit 687a0400 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Dave Airlie
Browse files

drm: plane: Check crtc coordinates against integer overflows in setplane ioctl 



Help drivers a little by guaranteeing that crtc_x+crtc_w and
crtc_y+crtc_h don't overflow.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 42ef8789

drivers/gpu/drm/drm_crtc.c

+12 −0
Original line number Diff line number Diff line
@@ -1732,6 +1732,18 @@ int drm_mode_setplane(struct drm_device *dev, void *data, 
		goto out;

	}



	/* Give drivers some help against integer overflows */

	if (plane_req->crtc_w > INT_MAX ||

	    plane_req->crtc_x > INT_MAX - (int32_t) plane_req->crtc_w ||

	    plane_req->crtc_h > INT_MAX ||

	    plane_req->crtc_y > INT_MAX - (int32_t) plane_req->crtc_h) {

		DRM_DEBUG_KMS("Invalid CRTC coordinates %ux%u+%d+%d\n",

			      plane_req->crtc_w, plane_req->crtc_h,

			      plane_req->crtc_x, plane_req->crtc_y);

		ret = -ERANGE;

		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,