From patchwork Tue Jun 14 09:24:55 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 878492 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 p5E9PJ0I004599 for ; Tue, 14 Jun 2011 09:25:22 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755860Ab1FNJZS (ORCPT ); Tue, 14 Jun 2011 05:25:18 -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 S1755894Ab1FNJZP (ORCPT ); Tue, 14 Jun 2011 05:25:15 -0400 Received: from localhost.localdomain (unknown [91.178.246.59]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 5AA6E35B80; Tue, 14 Jun 2011 09:25:03 +0000 (UTC) From: Laurent Pinchart To: linux-fbdev@vger.kernel.org Cc: Krzysztof Helt Subject: [PATCH v2 17/29] pm2fb: use display information in info not in var for panning Date: Tue, 14 Jun 2011 11:24:55 +0200 Message-Id: <1308043507-11083-18-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: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: Krzysztof Helt --- drivers/video/pm2fb.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/video/pm2fb.c b/drivers/video/pm2fb.c index 27f93aa..f4f8ce8 100644 --- a/drivers/video/pm2fb.c +++ b/drivers/video/pm2fb.c @@ -973,8 +973,8 @@ static int pm2fb_pan_display(struct fb_var_screeninfo *var, { struct pm2fb_par *p = info->par; u32 base; - u32 depth = (var->bits_per_pixel + 7) & ~7; - u32 xres = (var->xres + 31) & ~31; + u32 depth = (info->var.bits_per_pixel + 7) & ~7; + u32 xres = (info->var.xres + 31) & ~31; depth = (depth > 32) ? 32 : depth; base = to3264(var->yoffset * xres + var->xoffset, depth, 1);