From patchwork Tue Jun 14 09:24:40 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 878362 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 p5E9PJ03004599 for ; Tue, 14 Jun 2011 09:25:19 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755826Ab1FNJZJ (ORCPT ); Tue, 14 Jun 2011 05:25:09 -0400 Received: from perceval.ideasonboard.com ([95.142.166.194]:58393 "EHLO perceval.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755638Ab1FNJZE (ORCPT ); Tue, 14 Jun 2011 05:25:04 -0400 Received: from localhost.localdomain (unknown [91.178.246.59]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id CCBFE35B5F for ; Tue, 14 Jun 2011 09:24:59 +0000 (UTC) From: Laurent Pinchart To: linux-fbdev@vger.kernel.org Subject: [PATCH v2 02/29] acornfb: Dont BUG() on invalid pan parameters Date: Tue, 14 Jun 2011 11:24:40 +0200 Message-Id: <1308043507-11083-3-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:19 +0000 (UTC) The driver currently BUG()s if the pan parameters passed directly from userspace are invalid. Return -EINVAL instead. Signed-off-by: Laurent Pinchart --- drivers/video/acornfb.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/drivers/video/acornfb.c b/drivers/video/acornfb.c index 6183a57..3bacc12 100644 --- a/drivers/video/acornfb.c +++ b/drivers/video/acornfb.c @@ -852,7 +852,8 @@ acornfb_pan_display(struct fb_var_screeninfo *var, struct fb_info *info) if (!(var->vmode & FB_VMODE_YWRAP)) y_bottom += var->yres; - BUG_ON(y_bottom > var->yres_virtual); + if (y_bottom > var->yres_virtual) + return -EINVAL; acornfb_update_dma(info, var);