Commit 0d5c6ca3 authored by Laurent Pinchart's avatar Laurent Pinchart

staging: xgifb: use display information in info not in var for panning

We must not use any information in the passed var besides xoffset,
yoffset and vmode as otherwise applications might abuse it.
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
parent 10a6c1de
...@@ -1364,26 +1364,16 @@ static int XGIfb_do_set_var(struct fb_var_screeninfo *var, int isactive, ...@@ -1364,26 +1364,16 @@ static int XGIfb_do_set_var(struct fb_var_screeninfo *var, int isactive,
} }
#ifdef XGIFB_PAN #ifdef XGIFB_PAN
static int XGIfb_pan_var(struct fb_var_screeninfo *var) static int XGIfb_pan_var(struct fb_var_screeninfo *var, struct fb_info *info)
{ {
unsigned int base; unsigned int base;
/* printk("Inside pan_var"); */ /* printk("Inside pan_var"); */
if (var->xoffset > (var->xres_virtual - var->xres)) { base = var->yoffset * info->var.xres_virtual + var->xoffset;
/* printk("Pan: xo: %d xv %d xr %d\n",
var->xoffset, var->xres_virtual, var->xres); */
return -EINVAL;
}
if (var->yoffset > (var->yres_virtual - var->yres)) {
/* printk("Pan: yo: %d yv %d yr %d\n",
var->yoffset, var->yres_virtual, var->yres); */
return -EINVAL;
}
base = var->yoffset * var->xres_virtual + var->xoffset;
/* calculate base bpp dep. */ /* calculate base bpp dep. */
switch (var->bits_per_pixel) { switch (info->var.bits_per_pixel) {
case 16: case 16:
base >>= 1; base >>= 1;
break; break;
...@@ -1681,9 +1671,9 @@ static int XGIfb_pan_display(struct fb_var_screeninfo *var, ...@@ -1681,9 +1671,9 @@ static int XGIfb_pan_display(struct fb_var_screeninfo *var,
/* printk("\nInside pan_display:\n"); */ /* printk("\nInside pan_display:\n"); */
if (var->xoffset > (var->xres_virtual - var->xres)) if (var->xoffset > (info->var.xres_virtual - info->var.xres))
return -EINVAL; return -EINVAL;
if (var->yoffset > (var->yres_virtual - var->yres)) if (var->yoffset > (info->var.yres_virtual - info->var.yres))
return -EINVAL; return -EINVAL;
if (var->vmode & FB_VMODE_YWRAP) { if (var->vmode & FB_VMODE_YWRAP) {
...@@ -1696,7 +1686,7 @@ static int XGIfb_pan_display(struct fb_var_screeninfo *var, ...@@ -1696,7 +1686,7 @@ static int XGIfb_pan_display(struct fb_var_screeninfo *var,
> info->var.yres_virtual) > info->var.yres_virtual)
return -EINVAL; return -EINVAL;
} }
err = XGIfb_pan_var(var); err = XGIfb_pan_var(var, info);
if (err < 0) if (err < 0)
return err; return err;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment