diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2011-05-25 11:34:52 +0200 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2011-08-19 10:32:31 +0200 |
| commit | f5b9cc6a66feee205609ef98b1f5a51168c26b74 (patch) | |
| tree | 4562f2d95a40895455123172a69723041dd728d5 /drivers/video/intelfb | |
| parent | 09a9168d4c3f3bf3b0f9306966379df500f201d2 (diff) | |
| download | linux-f5b9cc6a66feee205609ef98b1f5a51168c26b74.tar.gz linux-f5b9cc6a66feee205609ef98b1f5a51168c26b74.tar.bz2 linux-f5b9cc6a66feee205609ef98b1f5a51168c26b74.zip | |
intelfb: 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: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'drivers/video/intelfb')
| -rw-r--r-- | drivers/video/intelfb/intelfbhw.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/intelfb/intelfbhw.c b/drivers/video/intelfb/intelfbhw.c index 38065cf94ac4..fbad61da359f 100644 --- a/drivers/video/intelfb/intelfbhw.c +++ b/drivers/video/intelfb/intelfbhw.c @@ -390,12 +390,12 @@ int intelfbhw_pan_display(struct fb_var_screeninfo *var, struct fb_info *info) xoffset = ROUND_DOWN_TO(var->xoffset, 8); yoffset = var->yoffset; - if ((xoffset + var->xres > var->xres_virtual) || - (yoffset + var->yres > var->yres_virtual)) + if ((xoffset + info->var.xres > info->var.xres_virtual) || + (yoffset + info->var.yres > info->var.yres_virtual)) return -EINVAL; offset = (yoffset * dinfo->pitch) + - (xoffset * var->bits_per_pixel) / 8; + (xoffset * info->var.bits_per_pixel) / 8; offset += dinfo->fb.offset << 12; |