From nobody Mon Apr 6 11:51:34 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8E3E0C4332F for ; Tue, 8 Nov 2022 11:00:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233806AbiKHLAF (ORCPT ); Tue, 8 Nov 2022 06:00:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47004 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233479AbiKHLAD (ORCPT ); Tue, 8 Nov 2022 06:00:03 -0500 Received: from jari.cn (unknown [218.92.28.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 7CA14450B3 for ; Tue, 8 Nov 2022 02:59:54 -0800 (PST) Received: by ajax-webmail-localhost.localdomain (Coremail) ; Tue, 8 Nov 2022 18:55:03 +0800 (GMT+08:00) X-Originating-IP: [182.148.13.29] Date: Tue, 8 Nov 2022 18:55:03 +0800 (GMT+08:00) X-CM-HeaderCharset: UTF-8 From: wangkailong@jari.cn To: Wentland , Li , Siqueira , Deucher , =?UTF-8?Q?Christian_K=C3=B6nig?= , "Pan, Xinhui" , Airlie , Vetter Cc: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH] drm/amd/display: fix array-bounds error in dc_stream_remove_writeback() X-Priority: 3 X-Mailer: Coremail Webmail Server Version XT6.0.1 build 20210329(c53f3fee) Copyright (c) 2002-2022 www.mailtech.cn mispb-4e503810-ca60-4ec8-a188-7102c18937cf-zhkzyfz.cn Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Message-ID: <7bafafdf.f5.18456e11abd.Coremail.wangkailong@jari.cn> X-Coremail-Locale: zh_CN X-CM-TRANSID: AQAAfwCXn+CHNWpjAcsBAA--.39W X-CM-SenderInfo: 5zdqwypdlo00nj6mt2flof0/1tbiAQAEB2FEYx0DdQABsu X-Coremail-Antispam: 1Ur529EdanIXcx71UUUUU7IcSsGvfJ3iIAIbVAYjsxI4VWxJw CS07vEb4IE77IF4wCS07vE1I0E4x80FVAKz4kxMIAIbVAFxVCaYxvI4VCIwcAKzIAtYxBI daVFxhVjvjDU= Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" replace the subsequent check for 'i !=3D j' with=20 Delete header file "timing_generator.h" Signed-off-by: KaiLong Wang --- drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c b/drivers/gpu/= drm/amd/display/dc/core/dc_stream.c index 38d71b5c1f2d..66661a20117b 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_stream.c @@ -29,7 +29,6 @@ #include "core_types.h" #include "resource.h" #include "ipp.h" -#include "timing_generator.h" #include "dc_dmub_srv.h" =20 #define DC_LOGGER dc->ctx->logger @@ -152,9 +151,8 @@ static void dc_stream_free(struct kref *kref) =20 void dc_stream_release(struct dc_stream_state *stream) { - if (stream !=3D NULL) { + if (stream !=3D NULL) kref_put(&stream->refcount, dc_stream_free); - } } =20 struct dc_stream_state *dc_create_stream_for_sink( @@ -316,11 +314,11 @@ bool dc_stream_set_cursor_attributes( struct dc *dc; bool reset_idle_optimizations =3D false; =20 - if (NULL =3D=3D stream) { + if (stream =3D=3D NULL) { dm_error("DC: dc_stream is NULL!\n"); return false; } - if (NULL =3D=3D attributes) { + if (attributes =3D=3D NULL) { dm_error("DC: attributes is NULL!\n"); return false; } @@ -399,12 +397,12 @@ bool dc_stream_set_cursor_position( struct dc *dc =3D stream->ctx->dc; bool reset_idle_optimizations =3D false; =20 - if (NULL =3D=3D stream) { + if (stream =3D=3D NULL) { dm_error("DC: dc_stream is NULL!\n"); return false; } =20 - if (NULL =3D=3D position) { + if (position =3D=3D NULL) { dm_error("DC: cursor position is NULL!\n"); return false; } @@ -468,9 +466,8 @@ bool dc_stream_add_writeback(struct dc *dc, } } =20 - if (!isDrc) { + if (!isDrc) stream->writeback_info[stream->num_wb_info++] =3D *wb_info; - } =20 if (dc->hwss.enable_writeback) { struct dc_stream_status *stream_status =3D dc_stream_get_status(stream); @@ -526,7 +523,7 @@ bool dc_stream_remove_writeback(struct dc *dc, /* remove writeback info for disabled writeback pipes from stream */ for (i =3D 0, j =3D 0; i < stream->num_wb_info; i++) { if (stream->writeback_info[i].wb_enabled) { - if (j < i) + if (i !=3D j) /* trim the array */ stream->writeback_info[j] =3D stream->writeback_info[i]; j++; --=20 2.36.1