From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matt Roper Date: Thu, 12 Dec 2019 17:27:07 +0000 Subject: Re: [PATCH] drm/i915/bios: fix off by one in parse_generic_dtd() Message-Id: <20191212172707.GF85422@mdroper-desk1.amr.corp.intel.com> List-Id: References: <20191212091130.zf2g53njf5u24wk6@kili.mountain> In-Reply-To: <20191212091130.zf2g53njf5u24wk6@kili.mountain> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Dan Carpenter Cc: Jani Nikula , kernel-janitors@vger.kernel.org, Lucas De Marchi , =?iso-8859-1?Q?Jos=E9?= Roberto de Souza , David Airlie , dri-devel@lists.freedesktop.org, Rodrigo Vivi , intel-gfx@lists.freedesktop.org On Thu, Dec 12, 2019 at 12:11:30PM +0300, Dan Carpenter wrote: > The "num_dtd" variable is the number of elements in the > generic_dtd->dtd[] array so the > needs to be >= to prevent reading one > element beyond the end of the array. > > Fixes: 33ef6d4fd8df ("drm/i915/vbt: Handle generic DTD block") > Signed-off-by: Dan Carpenter Reviewed-by: Matt Roper > --- > drivers/gpu/drm/i915/display/intel_bios.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c > index 1aeecdd02293..d1e27ee86e53 100644 > --- a/drivers/gpu/drm/i915/display/intel_bios.c > +++ b/drivers/gpu/drm/i915/display/intel_bios.c > @@ -338,7 +338,7 @@ parse_generic_dtd(struct drm_i915_private *dev_priv, > > num_dtd = (get_blocksize(generic_dtd) - > sizeof(struct bdb_generic_dtd)) / generic_dtd->gdtd_size; > - if (dev_priv->vbt.panel_type > num_dtd) { > + if (dev_priv->vbt.panel_type >= num_dtd) { > DRM_ERROR("Panel type %d not found in table of %d DTD's\n", > dev_priv->vbt.panel_type, num_dtd); > return; > -- > 2.11.0 > -- Matt Roper Graphics Software Engineer VTT-OSGC Platform Enablement Intel Corporation (916) 356-2795 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 58888C2D0C9 for ; Thu, 12 Dec 2019 17:27:12 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3DE9C21655 for ; Thu, 12 Dec 2019 17:27:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3DE9C21655 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id ECA7A6E0A0; Thu, 12 Dec 2019 17:27:09 +0000 (UTC) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by gabe.freedesktop.org (Postfix) with ESMTPS id DF4CD6E067; Thu, 12 Dec 2019 17:27:08 +0000 (UTC) X-Amp-Result: UNSCANNABLE X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 12 Dec 2019 09:27:08 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,306,1571727600"; d="scan'208";a="204035372" Received: from mdroper-desk1.fm.intel.com (HELO mdroper-desk1.amr.corp.intel.com) ([10.1.27.64]) by orsmga007.jf.intel.com with ESMTP; 12 Dec 2019 09:27:07 -0800 Date: Thu, 12 Dec 2019 09:27:07 -0800 From: Matt Roper To: Dan Carpenter Subject: Re: [PATCH] drm/i915/bios: fix off by one in parse_generic_dtd() Message-ID: <20191212172707.GF85422@mdroper-desk1.amr.corp.intel.com> References: <20191212091130.zf2g53njf5u24wk6@kili.mountain> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20191212091130.zf2g53njf5u24wk6@kili.mountain> User-Agent: Mutt/1.12.1 (2019-06-15) X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jani Nikula , kernel-janitors@vger.kernel.org, Lucas De Marchi , =?iso-8859-1?Q?Jos=E9?= Roberto de Souza , David Airlie , dri-devel@lists.freedesktop.org, Rodrigo Vivi , intel-gfx@lists.freedesktop.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Thu, Dec 12, 2019 at 12:11:30PM +0300, Dan Carpenter wrote: > The "num_dtd" variable is the number of elements in the > generic_dtd->dtd[] array so the > needs to be >= to prevent reading one > element beyond the end of the array. > > Fixes: 33ef6d4fd8df ("drm/i915/vbt: Handle generic DTD block") > Signed-off-by: Dan Carpenter Reviewed-by: Matt Roper > --- > drivers/gpu/drm/i915/display/intel_bios.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c > index 1aeecdd02293..d1e27ee86e53 100644 > --- a/drivers/gpu/drm/i915/display/intel_bios.c > +++ b/drivers/gpu/drm/i915/display/intel_bios.c > @@ -338,7 +338,7 @@ parse_generic_dtd(struct drm_i915_private *dev_priv, > > num_dtd = (get_blocksize(generic_dtd) - > sizeof(struct bdb_generic_dtd)) / generic_dtd->gdtd_size; > - if (dev_priv->vbt.panel_type > num_dtd) { > + if (dev_priv->vbt.panel_type >= num_dtd) { > DRM_ERROR("Panel type %d not found in table of %d DTD's\n", > dev_priv->vbt.panel_type, num_dtd); > return; > -- > 2.11.0 > -- Matt Roper Graphics Software Engineer VTT-OSGC Platform Enablement Intel Corporation (916) 356-2795 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5430AC2D0C9 for ; Thu, 12 Dec 2019 17:27:10 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 39BFC21655 for ; Thu, 12 Dec 2019 17:27:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 39BFC21655 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C51E86E067; Thu, 12 Dec 2019 17:27:09 +0000 (UTC) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by gabe.freedesktop.org (Postfix) with ESMTPS id DF4CD6E067; Thu, 12 Dec 2019 17:27:08 +0000 (UTC) X-Amp-Result: UNSCANNABLE X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 12 Dec 2019 09:27:08 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,306,1571727600"; d="scan'208";a="204035372" Received: from mdroper-desk1.fm.intel.com (HELO mdroper-desk1.amr.corp.intel.com) ([10.1.27.64]) by orsmga007.jf.intel.com with ESMTP; 12 Dec 2019 09:27:07 -0800 Date: Thu, 12 Dec 2019 09:27:07 -0800 From: Matt Roper To: Dan Carpenter Message-ID: <20191212172707.GF85422@mdroper-desk1.amr.corp.intel.com> References: <20191212091130.zf2g53njf5u24wk6@kili.mountain> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20191212091130.zf2g53njf5u24wk6@kili.mountain> User-Agent: Mutt/1.12.1 (2019-06-15) Subject: Re: [Intel-gfx] [PATCH] drm/i915/bios: fix off by one in parse_generic_dtd() X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jani Nikula , kernel-janitors@vger.kernel.org, Lucas De Marchi , David Airlie , dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Thu, Dec 12, 2019 at 12:11:30PM +0300, Dan Carpenter wrote: > The "num_dtd" variable is the number of elements in the > generic_dtd->dtd[] array so the > needs to be >= to prevent reading one > element beyond the end of the array. > > Fixes: 33ef6d4fd8df ("drm/i915/vbt: Handle generic DTD block") > Signed-off-by: Dan Carpenter Reviewed-by: Matt Roper > --- > drivers/gpu/drm/i915/display/intel_bios.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c > index 1aeecdd02293..d1e27ee86e53 100644 > --- a/drivers/gpu/drm/i915/display/intel_bios.c > +++ b/drivers/gpu/drm/i915/display/intel_bios.c > @@ -338,7 +338,7 @@ parse_generic_dtd(struct drm_i915_private *dev_priv, > > num_dtd = (get_blocksize(generic_dtd) - > sizeof(struct bdb_generic_dtd)) / generic_dtd->gdtd_size; > - if (dev_priv->vbt.panel_type > num_dtd) { > + if (dev_priv->vbt.panel_type >= num_dtd) { > DRM_ERROR("Panel type %d not found in table of %d DTD's\n", > dev_priv->vbt.panel_type, num_dtd); > return; > -- > 2.11.0 > -- Matt Roper Graphics Software Engineer VTT-OSGC Platform Enablement Intel Corporation (916) 356-2795 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx