Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

sisfb: use display information in info not in var for panning

Browse source 
We must not use any information in the passed var besides xoffset,
yoffset and vmode as otherwise applications might abuse it.

Fix checkpatch.pl warnings in the surrounding code.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Laurent Pinchart 2011-05-25 11:34:52 +02:00
parent e1599cf8c7
commit 8e42a962a2
1 changed files with 10 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
drivers/video/sis/sis_main.c
View file

@ -1333,19 +1333,14 @@ sisfb_set_base_CRT2(struct sis_video_info *ivideo, unsigned int base)
} }
static int static int
sisfb_pan_var(struct sis_video_info *ivideo, struct fb_var_screeninfo *var) sisfb_pan_var(struct sis_video_info *ivideo, struct fb_info *info,
struct fb_var_screeninfo *var)
{ {
if(var->xoffset > (var->xres_virtual - var->xres)) { ivideo->current_base = var->yoffset * info->var.xres_virtual
return -EINVAL; + var->xoffset;
}
if(var->yoffset > (var->yres_virtual - var->yres)) {
return -EINVAL;
}
ivideo->current_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 32: case 32:
break; break;
case 16: case 16:
@ -1635,12 +1630,6 @@ sisfb_pan_display(struct fb_var_screeninfo *var, struct fb_info* info)
struct sis_video_info *ivideo = (struct sis_video_info *)info->par; struct sis_video_info *ivideo = (struct sis_video_info *)info->par;
int err; int err;
if(var->xoffset > (var->xres_virtual - var->xres))
return -EINVAL;
if(var->yoffset > (var->yres_virtual - var->yres))
return -EINVAL;
if (var->vmode & FB_VMODE_YWRAP) if (var->vmode & FB_VMODE_YWRAP)
return -EINVAL; return -EINVAL;
@ -1648,7 +1637,8 @@ sisfb_pan_display(struct fb_var_screeninfo *var, struct fb_info* info)
var->yoffset + info->var.yres > info->var.yres_virtual) var->yoffset + info->var.yres > info->var.yres_virtual)
return -EINVAL; return -EINVAL;
if((err = sisfb_pan_var(ivideo, var)) < 0) err = sisfb_pan_var(ivideo, info, var);
if (err < 0)
return err; return err;
info->var.xoffset = var->xoffset; info->var.xoffset = var->xoffset;