Attachment 59090 Details for Bug 38138 – Validate requested panning size

[patch] Validate requested panning size

0001-drm-Validate-requested-virtual-size-against-allocate.patch (text/plain), 1.87 KB, created by Chris Wilson on 2012-03-26 13:13:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Wilson

Created: 2012-03-26 13:13:38 UTC

Size: 1.87 KB

patch

obsolete

>From 0f8ca77510e3f2a57ad9de216e4dd77b33d6a755 Mon Sep 17 00:00:00 2001
>From: Chris Wilson <chris@chris-wilson.co.uk>
>Date: Mon, 26 Mar 2012 21:02:14 +0100
>Subject: [PATCH] drm: Validate requested virtual size against allocated fb
> size
>
>mplayer -vo fbdev tries to create a screen that is twice as tall as the
>allocated framebuffer for "doublebuffering". By default, and all in-tree
>users, only sufficient memory is allocated and mapped to satisfy the
>smallest framebuffer and the virtual size is no larger than the actual.
>For these users, we should therefore reject any userspace request to
>create a screen that requires a buffer larger than the framebuffer
>originally allocated.
>
>References: https://bugs.freedesktop.org/show_bug.cgi?id=38138
>Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>---
> drivers/gpu/drm/drm_fb_helper.c |    8 ++++++--
> 1 files changed, 6 insertions(+), 2 deletions(-)
>
>diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
>index 7740dd2..a0d6e89 100644
>--- a/drivers/gpu/drm/drm_fb_helper.c
>+++ b/drivers/gpu/drm/drm_fb_helper.c
>@@ -559,9 +559,13 @@ int drm_fb_helper_check_var(struct fb_var_screeninfo *var,
> 		return -EINVAL;
> 
> 	/* Need to resize the fb object !!! */
>-	if (var->bits_per_pixel > fb->bits_per_pixel || var->xres > fb->width || var->yres > fb->height) {
>+	if (var->bits_per_pixel > fb->bits_per_pixel ||
>+	    var->xres > fb->width || var->yres > fb->height ||
>+	    var->xres_virtual > fb->width || var->yres_virtual > fb->height) {
> 		DRM_DEBUG("fb userspace requested width/height/bpp is greater than current fb "
>-			  "object %dx%d-%d > %dx%d-%d\n", var->xres, var->yres, var->bits_per_pixel,
>+			  "request %dx%d-%d (virtual %dx%d) > %dx%d-%d\n",
>+			  var->xres, var->yres, var->bits_per_pixel,
>+			  var->xres_virtual, var->yres_virtual,
> 			  fb->width, fb->height, fb->bits_per_pixel);
> 		return -EINVAL;
> 	}
>-- 
>1.7.9.1
>

Actions: View | Splinter Review

Attachments on bug 38138: 48933 | 59083 | 59090

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.