From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jesse Barnes Subject: Re: [PATCH 4/7] drm: plane: Check source coordinates Date: Fri, 11 Nov 2011 08:24:18 -0800 Message-ID: <20111111082418.5dd4c93a@jbarnes-desktop> References: <1321027447-17921-1-git-send-email-ville.syrjala@linux.intel.com> <1321027447-17921-5-git-send-email-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2035751417==" Return-path: Received: from oproxy6-pub.bluehost.com (oproxy6-pub.bluehost.com [67.222.54.6]) by gabe.freedesktop.org (Postfix) with SMTP id ABE7BA0DEF for ; Fri, 11 Nov 2011 08:23:58 -0800 (PST) In-Reply-To: <1321027447-17921-5-git-send-email-ville.syrjala@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org To: ville.syrjala@linux.intel.com Cc: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org --===============2035751417== Content-Type: multipart/signed; micalg=PGP-SHA1; boundary="Sig_/ODMCNZ072eR56FKQr0116YF"; protocol="application/pgp-signature" --Sig_/ODMCNZ072eR56FKQr0116YF Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable On Fri, 11 Nov 2011 18:04:04 +0200 ville.syrjala@linux.intel.com wrote: > From: Ville Syrj=E4l=E4 >=20 > Make sure the source coordinates stay within the buffer. >=20 > Signed-off-by: Ville Syrj=E4l=E4 > --- > drivers/gpu/drm/drm_crtc.c | 23 +++++++++++++++++++++++ > 1 files changed, 23 insertions(+), 0 deletions(-) >=20 > diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c > index 70f5747..098cc50 100644 > --- a/drivers/gpu/drm/drm_crtc.c > +++ b/drivers/gpu/drm/drm_crtc.c > @@ -1654,6 +1654,7 @@ int drm_mode_setplane(struct drm_device *dev, void = *data, > struct drm_crtc *crtc; > struct drm_framebuffer *fb; > int ret =3D 0; > + unsigned int fb_width, fb_height; > =20 > if (!drm_core_check_feature(dev, DRIVER_MODESET)) > return -EINVAL; > @@ -1702,6 +1703,28 @@ int drm_mode_setplane(struct drm_device *dev, void= *data, > } > fb =3D obj_to_fb(obj); > =20 > + fb_width =3D fb->width << 16; > + fb_height =3D 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 " > + "%01u.%06ux%01u.%06u+%01u.%06u+%01u.%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 =3D -EINVAL; > + goto out; > + } > + > ret =3D plane->funcs->update_plane(plane, crtc, fb, > plane_req->crtc_x, plane_req->crtc_y, > plane_req->crtc_w, plane_req->crtc_h, Good sanity check (saves the drivers from having to do it), but I wonder if we can use a better return value like ENOSPC or something to make it easier for userspace to figure out. --=20 Jesse Barnes, Intel Open Source Technology Center --Sig_/ODMCNZ072eR56FKQr0116YF Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iQIcBAEBAgAGBQJOvUwyAAoJEIEoDkX4Qk9hhrwQAIjMPI/INwfVrox6aNmOp9lH 8ZoZE2KLTXobQqenWXAZ/AZm3EiC9I15nln8rgJnSmHxIsqdjK3hBgzX2A2FPGky RCdb5FstlJG1KifqX8aU0yFGFqrTiD2deZ+aMg4uW/qQG5cK7zIvFtHya2Pj28o/ piSAcPI1EEvEYSGzF0JZFcK9ecVtR8vkVq5p3ywFQ3rND4Sej9e/IbxtAYWo4wkG IcosyMxouuYv4+J8uiD4ak7QH1xTO5CRux7pcomS4Yv4IKZjGZdD7xMsSiG5aWZ7 cGGxzA3K5uxUAbDibU+2vjdQpFKw5DMZ1cYkbthphManZ4c9TWB+HUl1t6TS6sbU N1XaeuSL008Xh+M/h5qrVEnVyP6ZAmLYqwa5HldaWV4J2wCNi6sFkna/ucyHD9MQ cl9J2X7SReZHYfYz/nXeMgc7Epms/+R2M+c1nt4yA4fzGsRTEamcwEofrj96PmrZ D6m7ubhA5dQoJyY6pWi5ScBml5IrvNhBN4YrQFwc6nM4L82SkTsTFaXMW6safubU ya78/AOZn0MFpp5k4Sbzp4b7w3CZm4YH/DJxOMm8+4Ob3lDLWPgociAbykSUoRI8 5EUJKg3uTX/ljnUx2YaFHySkV7M9ZGF7mmUj+E0jOesclt4KiUfEpY79mGIUQWTQ 6BRDQIG5hWR1KWLHziGV =d/sg -----END PGP SIGNATURE----- --Sig_/ODMCNZ072eR56FKQr0116YF-- --===============2035751417== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/dri-devel --===============2035751417==--