From patchwork Wed May 25 22:58:20 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 818702 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p4PMwAsu026945 for ; Wed, 25 May 2011 22:58:22 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756976Ab1EYW6W (ORCPT ); Wed, 25 May 2011 18:58:22 -0400 Received: from perceval.ideasonboard.com ([95.142.166.194]:53777 "EHLO perceval.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756152Ab1EYW6S (ORCPT ); Wed, 25 May 2011 18:58:18 -0400 Received: from localhost.localdomain (unknown [91.178.57.18]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id CBD4635B69; Wed, 25 May 2011 22:58:14 +0000 (UTC) From: Laurent Pinchart To: linux-fbdev@vger.kernel.org Cc: Ondrej Zajicek , "David S. Miller" Subject: [PATCH 28/29] vt8623fb: use display information in info not in var for panning Date: Thu, 26 May 2011 00:58:20 +0200 Message-Id: <1306364301-8195-29-git-send-email-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <201105232211.40154.laurent.pinchart@ideasonboard.com> References: <201105232211.40154.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 (demeter1.kernel.org [140.211.167.41]); Wed, 25 May 2011 22:58:22 +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: Ondrej Zajicek Cc: David S. Miller --- drivers/video/vt8623fb.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/video/vt8623fb.c b/drivers/video/vt8623fb.c index f9b3e3d..4e74d26 100644 --- a/drivers/video/vt8623fb.c +++ b/drivers/video/vt8623fb.c @@ -620,13 +620,14 @@ static int vt8623fb_pan_display(struct fb_var_screeninfo *var, struct fb_info *i unsigned int offset; /* Calculate the offset */ - if (var->bits_per_pixel == 0) { - offset = (var->yoffset / 16) * var->xres_virtual + var->xoffset; + if (info->var.bits_per_pixel == 0) { + offset = (var->yoffset / 16) * info->var.xres_virtual + + var->xoffset; offset = offset >> 3; } else { offset = (var->yoffset * info->fix.line_length) + - (var->xoffset * var->bits_per_pixel / 8); - offset = offset >> ((var->bits_per_pixel == 4) ? 2 : 1); + (var->xoffset * info->var.bits_per_pixel / 8); + offset = offset >> ((info->var.bits_per_pixel == 4) ? 2 : 1); } /* Set the offset */