From patchwork Fri Feb 14 15:35:54 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 3652981 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0992F9F382 for ; Fri, 14 Feb 2014 15:36:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2C7172021A for ; Fri, 14 Feb 2014 15:36:10 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 3847B201C7 for ; Fri, 14 Feb 2014 15:36:08 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 907D0FA1B7; Fri, 14 Feb 2014 07:36:06 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ea0-f173.google.com (mail-ea0-f173.google.com [209.85.215.173]) by gabe.freedesktop.org (Postfix) with ESMTP id C094CFA1B7 for ; Fri, 14 Feb 2014 07:36:03 -0800 (PST) Received: by mail-ea0-f173.google.com with SMTP id d10so5875019eaj.32 for ; Fri, 14 Feb 2014 07:36:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id; bh=8I02viLgXhUQdGf4W5WCQRT3T49oWaynm3PbTIeUnj0=; b=S+781LC5R7amGUL6fNy3ICkolnQtT0Re6GAkN0rssw7Acr002gWA+xXlHx6l9wWwEz OsgAq4y4rdFNoXtwtZzjSDFvhO/LQkrM/4IA5kYmLPRNWioT54rmLl1LLu1nSrlqsYrD sosr+GgQXF7LFRJB9BTkXo/qoIvr5lvqj7QGY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=8I02viLgXhUQdGf4W5WCQRT3T49oWaynm3PbTIeUnj0=; b=BE3f+fatPmp+hhnezu4CrKks+g5Md0xVMIwFZjVDNB76n/8xB5HCtylREBQjbs4PFo bYpHMDaI7Auf0WMK3YX0WCWF88wKQ8IgZlcMiyVDZ+UHAzrH159pOfuy6nwXi49cMCQ2 dBdRxvfpm1GiLK5SvOneCmgWipS6iFwP8Q/nb6qyVCWPOi6dpIQE2tHSgho+QSsNQCFH XYwouhY3XbhXG2/uniLqotthBhvn6XfE9qdwUXM32Wu6BTuMliYaQWFuivY+JTaxWGjU 0Sse2JEwImEVOUNlvTQ3WyuWK8rRrn7gdRldEyRaDM1bt1zhpHapNSwkWVWVe6e8Ic4y LvTA== X-Gm-Message-State: ALoCoQmRgXznE0q3vnk7Q6qzdybDEpKc2D+9syP+PLZmJkvGG8aEksMorvLTZjwrJFGSwgnQAJnz X-Received: by 10.14.103.134 with SMTP id f6mr9853172eeg.41.1392392162975; Fri, 14 Feb 2014 07:36:02 -0800 (PST) Received: from gina.ffwll.local (84-73-67-144.dclient.hispeed.ch. [84.73.67.144]) by mx.google.com with ESMTPSA id 46sm20994972ees.4.2014.02.14.07.36.01 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Feb 2014 07:36:01 -0800 (PST) From: Daniel Vetter To: Intel Graphics Development Date: Fri, 14 Feb 2014 16:35:54 +0100 Message-Id: <1392392154-3479-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.8.4.rc3 Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH] drm/i915: fix NULL deref in the load detect code X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org X-Spam-Status: No, score=-4.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Looks like I've missed one of the potential NULL deref bugs in Jesse's fbdev->fb embedded struct to pointer conversions. Fix it up. This regression has been introduced in commit 8bcd45534ddf68ab71aeed709dacd9cf65dc0f75 Author: Jesse Barnes Date: Fri Feb 7 12:10:38 2014 -0800 drm/i915: alloc intel_fb in the intel_fbdev struct Cc: Jesse Barnes Signed-off-by: Daniel Vetter Reviewed-by: Jesse Barnes --- drivers/gpu/drm/i915/intel_display.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 0d3f2a5f4d2d..f19e6ea36dc4 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -7754,13 +7754,15 @@ mode_fits_in_fbdev(struct drm_device *dev, struct drm_i915_gem_object *obj; struct drm_framebuffer *fb; - if (dev_priv->fbdev == NULL) + if (!dev_priv->fbdev) return NULL; - obj = dev_priv->fbdev->fb->obj; - if (obj == NULL) + if (!dev_priv->fbdev->fb) return NULL; + obj = dev_priv->fbdev->fb->obj; + BUG_ON(!obj); + fb = &dev_priv->fbdev->fb->base; if (fb->pitches[0] < intel_framebuffer_pitch_for_width(mode->hdisplay, fb->bits_per_pixel))