Commit 5dac1518 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Paul Mundt
Browse files

sisfb: 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.

Fix checkpatch.pl warnings in the surrounding code.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Aaro Koskinen <aaro.koskinen@iki.fi>
Cc: Thomas Winischhofer <thomas@winischhofer.net>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent df9306de

drivers/video/sis/sis_main.c

+10 −20
Original line number Diff line number Diff line
@@ -1333,19 +1333,14 @@ sisfb_set_base_CRT2(struct sis_video_info *ivideo, unsigned int base) 
}



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)) {

		return -EINVAL;

	}

	if(var->yoffset > (var->yres_virtual - var->yres)) {

		return -EINVAL;

	}



	ivideo->current_base = (var->yoffset * var->xres_virtual) + var->xoffset;

	ivideo->current_base = var->yoffset * info->var.xres_virtual

			     + var->xoffset;



	/* calculate base bpp dep. */

	switch(var->bits_per_pixel) {

	switch (info->var.bits_per_pixel) {

	case 32:

		break;

	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;

	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)

		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)

		return -EINVAL;



	if((err = sisfb_pan_var(ivideo, var)) < 0)

	err = sisfb_pan_var(ivideo, info, var);

	if (err < 0)

		return err;



	info->var.xoffset = var->xoffset;