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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id EE83FC0218A for ; Wed, 29 Jan 2025 02:56:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9D57110E723; Wed, 29 Jan 2025 02:56:31 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=amd.com header.i=@amd.com header.b="L1VNxyFU"; dkim-atps=neutral Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2086.outbound.protection.outlook.com [40.107.220.86]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1D17610E723 for ; Wed, 29 Jan 2025 02:56:30 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Ty/UC+olKc39gasLfnUzss9xviQDqqO9puU0PPZFV5w+249/Fuvq0+nTNy8H1Cdfvu15f+ccuvTvOJ1xApe/OTeku0FygflGpkfZvJHf7bGl6ULf/Gw+El+bbopRrYumJIQa4BhgB/GNZ9bqaZg7fY4BtHugH+kfAZ7KnEIKWqNqPukiwToTuzOvzmtGVGUe1l3MA884mE771cjnvbXennZ4DC1naiPsqBGdYAhmR4IksfNHgEfXy6+ZH6yzSJPWbY8hCwGRMynxYq+fIEZNPiHCmtO3tEEFSh79H9LP5aJjpg+P42n7QFD/KNQPuH4oj3ToZwvxQvdRzihAYi8Y4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Ec7a7LcTDaWUUP/cIjxfjMA+Gc1K9wMgoktPJTvEiDM=; b=cgVqXrHdTP8uZWq61FMhssY+3dmdO9gDFvXzK4fpmLxysrESQv1gHCo858k2Z13LfY0Hzc9g36OQWxsf4VSvgd7P0LGCmDRXm39fsyZye7hMC0+af5NetUS823lDAIq+TcVPo/rtqjPifcrv9xZxJQoKufCl8RsO51xRpiMfe0ypjtGQpV0DR6g4gYAjgcD2Pkp92TUrC8jMI2RMRrGpDM3xY4d/6r5VMK1WBfRADU8z1j0v5CLcIGBx2UkxKLLQboJ6YzQ/3HhVyaEyA9u5w3RN1VQKt/usfc0viwvcuzOutALCivspBmXWgxE0Yyd1t4SWqHVMof1ivkifH2BV2Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.freedesktop.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Ec7a7LcTDaWUUP/cIjxfjMA+Gc1K9wMgoktPJTvEiDM=; b=L1VNxyFU8bDppxy+djJFB2iNgRMygDLERVFLUETb8TsK+c78n9ZBWGSOaxAcoL62lCNidwL/ydoShsfkRH6yPDu71ohRrnsVjXYtKrSA1eNx49K+D3b48/oKOv4wWk1amUGJolgoGJYD2IEGUWGy9KL3PLdpqhSeH5f263phTYg= Received: from BY5PR04CA0026.namprd04.prod.outlook.com (2603:10b6:a03:1d0::36) by SA1PR12MB6995.namprd12.prod.outlook.com (2603:10b6:806:24e::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8377.22; Wed, 29 Jan 2025 02:56:24 +0000 Received: from MWH0EPF000971E8.namprd02.prod.outlook.com (2603:10b6:a03:1d0:cafe::26) by BY5PR04CA0026.outlook.office365.com (2603:10b6:a03:1d0::36) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8398.17 via Frontend Transport; Wed, 29 Jan 2025 02:56:24 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by MWH0EPF000971E8.mail.protection.outlook.com (10.167.243.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8398.14 via Frontend Transport; Wed, 29 Jan 2025 02:56:24 +0000 Received: from smtp.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Tue, 28 Jan 2025 20:56:21 -0600 From: Alex Hung To: CC: Harry Wentland , Leo Li , Rodrigo Siqueira , Aurabindo Pillai , Roman Li , Wayne Lin , Tom Chung , Fangzhi Zuo , Zaeem Mohamed , Solomon Chiu , Daniel Wheeler , Alex Hung , Austin Zheng Subject: [PATCH 02/10] drm/amd/display: Fix out-of-bound accesses Date: Tue, 28 Jan 2025 19:53:46 -0700 Message-ID: <20250129025458.2120268-3-alex.hung@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250129025458.2120268-1-alex.hung@amd.com> References: <20250129025458.2120268-1-alex.hung@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWH0EPF000971E8:EE_|SA1PR12MB6995:EE_ X-MS-Office365-Filtering-Correlation-Id: 9802dff9-d2a0-4d97-0367-08dd40108484 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|82310400026|376014|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?V1vzUgw5jY/ILUBY2WkCP1/zC6tinwW7DkB6p6f8nAaOyWAWTpvqM5LZREcr?= =?us-ascii?Q?JMUj5ptrmzA8pLcbu+3RF9KsgLI95MpqmuOACAuTpmy88aVqsZZLOP+qK6Ec?= =?us-ascii?Q?KvFJbGrje5R/lpSE6BCVuB6SsKtfX4ThyduY8iLFTM2O6l3lPbiJXfx4mbhI?= =?us-ascii?Q?kEzOQZ/F27C5+5hHV/AkxC+79zJyJQZ9IYpG1P0FK7fACZBNVIoBSLCdXggA?= =?us-ascii?Q?iKL40Ci+LiA49n91wMhcy3pR9DjDUNJBzmIZLE9/HDeKKtn9Z8dd+svbm7En?= =?us-ascii?Q?5tsJRR/AThdiGmaWDCqcptuqgS17y8pTWUAvsTBzavNmfGuaXqA7Jw+X+55B?= =?us-ascii?Q?kE7Z+Vjvxzv7n/HbgImOJmm87qdUJ1lAQNLIf/qlxHAzIYkPI9uVTxrrqWpi?= =?us-ascii?Q?FADrOI8+i4p1WAHoTHWpKiRK5Cj3liLyJM+d6OT9SDOl0nxMOhSPJ8+T3gac?= =?us-ascii?Q?yStm+M4LzRyLuhAJsDe2UZDmGJjA2W8fnIx5DtdfoeReffLkNQz59a7iA3NK?= =?us-ascii?Q?SB32RavFA3YrnbuJSczpHQGYOJYJ5r3RAXgytJlC0jIZ+DjkzEKwRlJnGocl?= =?us-ascii?Q?aY5qNWe/41hqR936Y25bXTAl2a1hj0ay3kXmJRZpFqmRSEGdPB3ulCsnfBsB?= =?us-ascii?Q?L01FK4tSIMm5Y+xmNm5PLpAYqI2Be4j3NXO1aomOMqwuyqE8tBq2UBjcqtrr?= =?us-ascii?Q?TxVk3xN7m3nBCpJn0QHel0zl0gebQCemCYw/nEGxKHhgMPtjpiSjKA3Kr3oZ?= =?us-ascii?Q?ux5e7fwCfHLzCiM57nasHdkjLQ2ynqszDyVbAigYe9Lwpq8gx5fYW7nA2EGg?= =?us-ascii?Q?UGWibF3Floe/AXBGCkL2TmHq+EjjU1BlgyemoRiLPSjTJ0baGNfB1+MQ54bM?= =?us-ascii?Q?qcWGPhjWJOm51JVGl20IuZ3UP1IynUqj0UMCvV6mGMIrcQXvb8qONU5IsGXE?= =?us-ascii?Q?cn3/LQjNjcXOuBbuIvnff7i0pu+eFm1EMT4bT2PWCCpWIIa0EafvLANTj39+?= =?us-ascii?Q?obpzBsR238bKkQ4mb2658jcHQAZm6GVQedcKRhl2VONLpkUwbqxGO4fFrUIC?= =?us-ascii?Q?8OUcenmGI/tS8RJrxj4KXKd6QW8l7QEQ+37wQpxV/zxgsM0t85jwhDGIb1L+?= =?us-ascii?Q?eEHJBLd/6Bcz/ceJsbn3RcJXryadCdHEhS7vnNnoZHm2TVNsgOAuTFTRogEm?= =?us-ascii?Q?rLBVT23nt9qzblNae2Yk2zzzmCt5R3EBZHMdf/Tg7zkbTNYYfKDCr3BTrg0M?= =?us-ascii?Q?U+a3qNwfrTK6//ar1ynRr/WXYQ+fwnS6n3j+XeqBa0N6I45+Scj89olk+cLp?= =?us-ascii?Q?lTwMqellefN2EfOb/ZFAyOmoDCQIqafjXUP8Vw9Slc4U7D+Yk9MomayJNeBc?= =?us-ascii?Q?rhBSUV4r/NEHMXL8lXquwb03qOWDzoVfgB2n6DXPaTUAV8cfByl6FJQ/LvgO?= =?us-ascii?Q?OmFaamfj6S7iM6L5ktq56MXarJ4F65yZFle0RGEgf35/wkC8y98RZAFRseo4?= =?us-ascii?Q?fhzS5Bqt76dB1yc=3D?= X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230040)(1800799024)(82310400026)(376014)(36860700013); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jan 2025 02:56:24.1658 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9802dff9-d2a0-4d97-0367-08dd40108484 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: MWH0EPF000971E8.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB6995 X-BeenThere: amd-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces@lists.freedesktop.org Sender: "amd-gfx" [WHAT & HOW] hpo_stream_to_link_encoder_mapping has size MAX_HPO_DP2_ENCODERS(=4), but location can have size up to 6. As a result, it is necessary to check location against MAX_HPO_DP2_ENCODERS. Similiarly, disp_cfg_stream_location can be used as an array index which should be 0..5, so the ASSERT's conditions should be less without equal. Reviewed-by: Austin Zheng Reviewed-by: Rodrigo Siqueira Signed-off-by: Alex Hung --- .../amd/display/dc/dml2/dml21/dml21_translation_helper.c | 4 ++-- .../gpu/drm/amd/display/dc/dml2/dml2_translation_helper.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/dml2/dml21/dml21_translation_helper.c b/drivers/gpu/drm/amd/display/dc/dml2/dml21/dml21_translation_helper.c index b9c6b45f6872..0c8ec30ea672 100644 --- a/drivers/gpu/drm/amd/display/dc/dml2/dml21/dml21_translation_helper.c +++ b/drivers/gpu/drm/amd/display/dc/dml2/dml21/dml21_translation_helper.c @@ -1017,7 +1017,7 @@ bool dml21_map_dc_state_into_dml_display_cfg(const struct dc *in_dc, struct dc_s if (disp_cfg_stream_location < 0) disp_cfg_stream_location = dml_dispcfg->num_streams++; - ASSERT(disp_cfg_stream_location >= 0 && disp_cfg_stream_location <= __DML2_WRAPPER_MAX_STREAMS_PLANES__); + ASSERT(disp_cfg_stream_location >= 0 && disp_cfg_stream_location < __DML2_WRAPPER_MAX_STREAMS_PLANES__); populate_dml21_timing_config_from_stream_state(&dml_dispcfg->stream_descriptors[disp_cfg_stream_location].timing, context->streams[stream_index], dml_ctx); adjust_dml21_hblank_timing_config_from_pipe_ctx(&dml_dispcfg->stream_descriptors[disp_cfg_stream_location].timing, &context->res_ctx.pipe_ctx[stream_index]); populate_dml21_output_config_from_stream_state(&dml_dispcfg->stream_descriptors[disp_cfg_stream_location].output, context->streams[stream_index], &context->res_ctx.pipe_ctx[stream_index]); @@ -1042,7 +1042,7 @@ bool dml21_map_dc_state_into_dml_display_cfg(const struct dc *in_dc, struct dc_s if (disp_cfg_plane_location < 0) disp_cfg_plane_location = dml_dispcfg->num_planes++; - ASSERT(disp_cfg_plane_location >= 0 && disp_cfg_plane_location <= __DML2_WRAPPER_MAX_STREAMS_PLANES__); + ASSERT(disp_cfg_plane_location >= 0 && disp_cfg_plane_location < __DML2_WRAPPER_MAX_STREAMS_PLANES__); populate_dml21_surface_config_from_plane_state(in_dc, &dml_dispcfg->plane_descriptors[disp_cfg_plane_location].surface, context->stream_status[stream_index].plane_states[plane_index]); populate_dml21_plane_config_from_plane_state(dml_ctx, &dml_dispcfg->plane_descriptors[disp_cfg_plane_location], context->stream_status[stream_index].plane_states[plane_index], context, stream_index); diff --git a/drivers/gpu/drm/amd/display/dc/dml2/dml2_translation_helper.c b/drivers/gpu/drm/amd/display/dc/dml2/dml2_translation_helper.c index b416320873e1..b8a34abaf519 100644 --- a/drivers/gpu/drm/amd/display/dc/dml2/dml2_translation_helper.c +++ b/drivers/gpu/drm/amd/display/dc/dml2/dml2_translation_helper.c @@ -786,7 +786,7 @@ static void populate_dml_output_cfg_from_stream_state(struct dml_output_cfg_st * case SIGNAL_TYPE_DISPLAY_PORT_MST: case SIGNAL_TYPE_DISPLAY_PORT: out->OutputEncoder[location] = dml_dp; - if (dml2->v20.scratch.hpo_stream_to_link_encoder_mapping[location] != -1) + if (location < MAX_HPO_DP2_ENCODERS && dml2->v20.scratch.hpo_stream_to_link_encoder_mapping[location] != -1) out->OutputEncoder[dml2->v20.scratch.hpo_stream_to_link_encoder_mapping[location]] = dml_dp2p0; break; case SIGNAL_TYPE_EDP: @@ -1343,7 +1343,7 @@ void map_dc_state_into_dml_display_cfg(struct dml2_context *dml2, struct dc_stat if (disp_cfg_stream_location < 0) disp_cfg_stream_location = dml_dispcfg->num_timings++; - ASSERT(disp_cfg_stream_location >= 0 && disp_cfg_stream_location <= __DML2_WRAPPER_MAX_STREAMS_PLANES__); + ASSERT(disp_cfg_stream_location >= 0 && disp_cfg_stream_location < __DML2_WRAPPER_MAX_STREAMS_PLANES__); populate_dml_timing_cfg_from_stream_state(&dml_dispcfg->timing, disp_cfg_stream_location, context->streams[i]); populate_dml_output_cfg_from_stream_state(&dml_dispcfg->output, disp_cfg_stream_location, context->streams[i], current_pipe_context, dml2); @@ -1383,7 +1383,7 @@ void map_dc_state_into_dml_display_cfg(struct dml2_context *dml2, struct dc_stat if (disp_cfg_plane_location < 0) disp_cfg_plane_location = dml_dispcfg->num_surfaces++; - ASSERT(disp_cfg_plane_location >= 0 && disp_cfg_plane_location <= __DML2_WRAPPER_MAX_STREAMS_PLANES__); + ASSERT(disp_cfg_plane_location >= 0 && disp_cfg_plane_location < __DML2_WRAPPER_MAX_STREAMS_PLANES__); populate_dml_surface_cfg_from_plane_state(dml2->v20.dml_core_ctx.project, &dml_dispcfg->surface, disp_cfg_plane_location, context->stream_status[i].plane_states[j]); populate_dml_plane_cfg_from_plane_state( -- 2.43.0