From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Date: Fri, 13 Dec 2019 07:10:58 +0000 Subject: Re: [PATCH] drm/i915/bios: fix off by one in parse_generic_dtd() Message-Id: <87r2181z0d.fsf@intel.com> List-Id: References: <20191212091130.zf2g53njf5u24wk6@kili.mountain> <20191212172707.GF85422@mdroper-desk1.amr.corp.intel.com> In-Reply-To: <20191212172707.GF85422@mdroper-desk1.amr.corp.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Matt Roper , Dan Carpenter Cc: David Airlie , kernel-janitors@vger.kernel.org, Lucas De Marchi , =?utf-8?Q?Jos=C3=A9?= Roberto de Souza , dri-devel@lists.freedesktop.org, Rodrigo Vivi , intel-gfx@lists.freedesktop.org On Thu, 12 Dec 2019, Matt Roper wrote: > 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 Pushed to drm-intel-next-queued, thanks for the patch and review. BR, Jani. > >> --- >> 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 >> -- Jani Nikula, Intel Open Source Graphics Center 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=-6.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED 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 0083EC2D0BF for ; Fri, 13 Dec 2019 07:11:06 +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 D405322527 for ; Fri, 13 Dec 2019 07:11:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D405322527 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 AA8C46E27F; Fri, 13 Dec 2019 07:11:03 +0000 (UTC) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0031E6E27F; Fri, 13 Dec 2019 07:11:01 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 12 Dec 2019 23:11:01 -0800 X-IronPort-AV: E=Sophos;i="5.69,308,1571727600"; d="scan'208";a="204240351" Received: from peterhae-mobl.ger.corp.intel.com (HELO localhost) ([10.252.49.100]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 12 Dec 2019 23:10:56 -0800 From: Jani Nikula To: Matt Roper , Dan Carpenter Subject: Re: [PATCH] drm/i915/bios: fix off by one in parse_generic_dtd() In-Reply-To: <20191212172707.GF85422@mdroper-desk1.amr.corp.intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20191212091130.zf2g53njf5u24wk6@kili.mountain> <20191212172707.GF85422@mdroper-desk1.amr.corp.intel.com> Date: Fri, 13 Dec 2019 09:10:58 +0200 Message-ID: <87r2181z0d.fsf@intel.com> MIME-Version: 1.0 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: David Airlie , kernel-janitors@vger.kernel.org, Lucas De Marchi , =?utf-8?Q?Jos=C3=A9?= Roberto de Souza , 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, 12 Dec 2019, Matt Roper wrote: > 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 Pushed to drm-intel-next-queued, thanks for the patch and review. BR, Jani. > >> --- >> 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 >> -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ 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=-6.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED 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 7A5B7C43603 for ; Fri, 13 Dec 2019 07:11:04 +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 58F4B2253D for ; Fri, 13 Dec 2019 07:11:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 58F4B2253D 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 C0D136E283; Fri, 13 Dec 2019 07:11:03 +0000 (UTC) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0031E6E27F; Fri, 13 Dec 2019 07:11:01 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 12 Dec 2019 23:11:01 -0800 X-IronPort-AV: E=Sophos;i="5.69,308,1571727600"; d="scan'208";a="204240351" Received: from peterhae-mobl.ger.corp.intel.com (HELO localhost) ([10.252.49.100]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 12 Dec 2019 23:10:56 -0800 From: Jani Nikula To: Matt Roper , Dan Carpenter In-Reply-To: <20191212172707.GF85422@mdroper-desk1.amr.corp.intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20191212091130.zf2g53njf5u24wk6@kili.mountain> <20191212172707.GF85422@mdroper-desk1.amr.corp.intel.com> Date: Fri, 13 Dec 2019 09:10:58 +0200 Message-ID: <87r2181z0d.fsf@intel.com> MIME-Version: 1.0 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: David Airlie , kernel-janitors@vger.kernel.org, Lucas De Marchi , 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, 12 Dec 2019, Matt Roper wrote: > 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 Pushed to drm-intel-next-queued, thanks for the patch and review. BR, Jani. > >> --- >> 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 >> -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx