From patchwork Tue Jun 14 09:24:51 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 878422 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p5E9PJ0C004599 for ; Tue, 14 Jun 2011 09:25:21 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755858Ab1FNJZP (ORCPT ); Tue, 14 Jun 2011 05:25:15 -0400 Received: from perceval.ideasonboard.com ([95.142.166.194]:58401 "EHLO perceval.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755874Ab1FNJZN (ORCPT ); Tue, 14 Jun 2011 05:25:13 -0400 Received: from localhost.localdomain (unknown [91.178.246.59]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 6E0A935B6D; Tue, 14 Jun 2011 09:25:02 +0000 (UTC) From: Laurent Pinchart To: linux-fbdev@vger.kernel.org Cc: Maik Broemme Subject: [PATCH v2 13/29] intelfb: use display information in info not in var for panning Date: Tue, 14 Jun 2011 11:24:51 +0200 Message-Id: <1308043507-11083-14-git-send-email-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1308043507-11083-1-git-send-email-laurent.pinchart@ideasonboard.com> References: <1308043507-11083-1-git-send-email-laurent.pinchart@ideasonboard.com> Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Tue, 14 Jun 2011 09:25:21 +0000 (UTC) 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 Cc: Maik Broemme --- 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 38065cf..fbad61d 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;