Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <f848623a-a1de-23f1-3334-5cf4ea0f4d89@amd.com>
Date:   Wed, 4 Jan 2023 17:22:46 -0500
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.5.1
Subject: =?UTF-8?B?UmU6IFtQQVRDSF0gZHJtL2FtZC9kaXNwbGF5OsKgZml4wqBhcnJheS1i?=
 =?UTF-8?Q?ounds=c2=a0errors=c2=a0in_dc=5fstream=5fremove=5fwriteback=28=29?=
Content-Language: en-US
To:     wenyang.linux@foxmail.com,
        Alex Deucher <alexander.deucher@amd.com>,
        Aurabindo Pillai <aurabindo.pillai@amd.com>
Cc:     Guenter Roeck <linux@roeck-us.net>,
        Harry Wentland <harry.wentland@amd.com>,
        Leo Li <sunpeng.li@amd.com>, amd-gfx@lists.freedesktop.org,
        dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
References: <tencent_13506618BF90E7B2AA796A9920DC49BEF407@qq.com>
From:   Hamza Mahfooz <hamza.mahfooz@amd.com>
In-Reply-To: <tencent_13506618BF90E7B2AA796A9920DC49BEF407@qq.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?bS9jRXl5OXlKcWU1VDlNdHdxOXlUN1lBZkk0MjZCUDl3cTlVbXpmb0Z2enM4?=
 =?utf-8?B?ZFBGOVBmNkszS05MTjJoWmdXZk5TWDJMZmJZS0FKaXRweEE1UGo5RjJtQ09r?=
 =?utf-8?B?cTJWbDMzRnlOY1B3RzZEbERnTnprSzBEMFQ3ZGh1YWZENlRTQzNIK2ZxbTRy?=
 =?utf-8?B?VGpQeU1GeWsvUmxVL0NUclpONEcvTWdON3Z2L3U5UnNUNzVNNDhvQnh5a1pQ?=
 =?utf-8?B?N0M5alppV1NwTVhqdE1jYjFocVh5d0t4SFhrc0NvSFFxanJkV3gyRFZEc0xw?=
 =?utf-8?B?N0dsN01NNzlwd1M2ZkVxbkFUYTF1cWZtUmZQY2ZrWHU4WWVuRDUzMEpLZ21s?=
 =?utf-8?B?V2I2Y1lmd2JrMEY0WklsS3FvM25qaVZzOE54RmFsUW05SGxCOGNBUFp4cVhI?=
 =?utf-8?B?cHFsSGZ5N211YzFmT3M5R3V0WEE4NUhYR0ZCS2c4dTdmenFxOUdSQnJoR0xB?=
 =?utf-8?B?cDYxTi9lK1hjZ1I5dkRBZlMxL3lDd01qVldYeERPMDBHa2Uzb0VQWHZ1dFQr?=
 =?utf-8?B?a0xUWGFTK1VIaWkrd1hHRHZEVVI3cG5KNWp3ako1K2NCMjZ3Q3dHcmJibExt?=
 =?utf-8?B?UjJUdGVaRGJSZHk4SjEyaHp3SEM1TUdFWFlJTUs5U0lXRER5ZERRL0RFTFFh?=
 =?utf-8?B?Q1NaRzFLcFgrNWQ3RDJpV3p6Z0tWVzRwNGlCcGU5TUtqZ0EwT1M4bzIvSW5s?=
 =?utf-8?B?Zm1rbmRGdlNHOUFNaDhVeHhmK1JiWHVLd3BwU1huaWlGMUZZV2VJdjF1SmhR?=
 =?utf-8?B?Ui91anB1SEFhdGUrWHBkeW84enlMSDZ0dUZRTVFEbEVSUTk2R3RzWUdNdzZa?=
 =?utf-8?B?L0xvSU1hTTlrKzdOY0FIM29Jbk5mc1pxVWhzV29TR2h6RnFzUDhHcTRtSWx0?=
 =?utf-8?B?RXZmVzlwNEFBV2tteVpYZkJqZE5DVzJ6dkdQRFFFamdna2E4S3dER05FNCt1?=
 =?utf-8?B?WGFuaUpjcU9mbTlzY21ITW5KNlA3YmNOVkJQeDlkSDRZYU8yVWJmd1ArMEpH?=
 =?utf-8?B?VEV1ZzRocXJHZ2YyLzZZanAzOGNXcUhGMDBPVlF2UG5vTDVjdzV2V1BHU1o4?=
 =?utf-8?B?RytFU0lUaW5TUlkraXV6MFkyVVNpNXBzeVNSUlF2K3U2eWwzWUllUFRCdkFs?=
 =?utf-8?B?bm9RUkFhWDNhMThicHNxa1c0WWN0VllUMXRKbmcyd0JMQzg3czZDSElsMGpN?=
 =?utf-8?B?Y001Z04rRjBjN3F0Qm8rQ2ZuTFlNZnJPL3U3Q2JCZTFOcGdLWThyOGJKQlNH?=
 =?utf-8?B?alpEdWVSYlFnd254M2ZGYkRaWVUzVzhISmRrd2QzTkhXMXkwd1FqZmNndTRo?=
 =?utf-8?B?ZWt0enNKOXZNMWxUWFNzaFNva3NjN3ppYy81T0hZYXkxRmpwUFhOSGRtTm01?=
 =?utf-8?B?U3QxVUpYSEZMZXJQMWRTOGNOM2lTS0NxRlN0eGtuQmRVQm9hd3R0SGJ0U1k4?=
 =?utf-8?B?SE91eWk3VTV2a0lRb1VNczVOdjlWNE9ETDdYT2h1SUxYTHhKUVpFRjIwUG1z?=
 =?utf-8?B?c2cwb1REZkl5VXlPYXNzb3czeXdYSGIxQzlMa05lQ2tWL1A0emJ4U0FTOE12?=
 =?utf-8?B?L0xBaFEyWkpwL1FzRFZVOVp5THkxYWZBWVFqNVV3eDQ5RkZXTkJEU2FPWlJn?=
 =?utf-8?B?djBsOC9sc1oyZXZtSi9va2pLc3ljak9LMzNnR1BUb3dOUzdTM21RS0x3S0ov?=
 =?utf-8?B?S2RSb1dSdzlZR1VFNGVzelJwT3hodGVDeXl1Y2ZuZ1F5alVaUjIwTGVvWTlL?=
 =?utf-8?B?ZFZna1orYmJHOS9sT2NwRmxsUi9oOXFHSlh3YjhoakMyKzZReEdNVm1WQmdH?=
 =?utf-8?B?eW1tMER5YnowUkdLOWNKZFROakgwK1lSczNmTU4walRtZE8yTGZ1RWdMZkl2?=
 =?utf-8?B?azZVQmZjOEdhaFJWVnNUWlJWdGRIWXQzYTB1cjFpeXRucWRJMlRnWHVlVHk1?=
 =?utf-8?B?RmFHWWZEb05mK3FWbEh4Q3RrYTdHRmhFSzFmRW8xdlU4Z1VyblNGNm0rU0Jz?=
 =?utf-8?B?TlJmdjlYTTRWcHMzMUVQRmJDUHAyK2RhZmE0cEt5WVUwczJYSG5wVlQ0L2dU?=
 =?utf-8?B?TkdqTmhjaTV4ZXN6VmFINmp1d0h1cTRvUHhZSHM5NFM0aVFQSkQxRytGR2F2?=
 =?utf-8?Q?Ux/GqUTpsp97sqxBtHa79TF3z?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 566fe66d-ee5d-4563-0b4f-08daeea215a7
X-MS-Exchange-CrossTenant-AuthSource: DM4PR12MB6280.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jan 2023 22:21:54.3290
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: N6UOnr33jeGTwNBoeeOXLPb8qLgtDdbYArZQXvzkqBYkGVPcS2kH9MaGqpTYixdzok/k1EvvbboyWitYUJS65g==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5125
X-Spam-Status: No, score=-3.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 12/25/22 10:10, wenyang.linux@foxmail.com wrote:
> From: Wen Yang <wenyang.linux@foxmail.com>
> 
> The following errors occurred when using gcc 7.5.0-3ubuntu1~18.04:
> drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_stream.c: In function ‘dc_stream_remove_writeback’:
> drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_stream.c:543:55: warning: array subscript is above array bounds [-Warray-bounds]
>       stream->writeback_info[j] = stream->writeback_info[i];
>                                   ~~~~~~~~~~~~~~~~~~~~~~^~~
> Add a check to make sure that num_wb_info won't overflowing the writeback_info buffer.
> 
> Fixes: 6fbefb84a98e ("drm/amd/display: Add DC core changes for DCN2")
> 
> Signed-off-by: Wen Yang <wenyang.linux@foxmail.com>
> Cc: Aurabindo Pillai <aurabindo.pillai@amd.com>
> Cc: Hamza Mahfooz <hamza.mahfooz@amd.com>
> Cc: Guenter Roeck <linux@roeck-us.net>
> Cc: Alex Deucher <alexander.deucher@amd.com>
> Cc: Harry Wentland <harry.wentland@amd.com>
> Cc: Leo Li <sunpeng.li@amd.com>
> Cc: amd-gfx@lists.freedesktop.org
> Cc: dri-devel@lists.freedesktop.org
> Cc: linux-kernel@vger.kernel.org

Applied, thanks!

> ---
>   drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 9 ++++++++-
>   1 file changed, 8 insertions(+), 1 deletion(-)
> 
> 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 20e534f73513..9825c30f2ca0 100644
> --- a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c
> +++ b/drivers/gpu/drm/amd/display/dc/core/dc_stream.c
> @@ -481,6 +481,7 @@ bool dc_stream_add_writeback(struct dc *dc,
>   	}
>   
>   	if (!isDrc) {
> +		ASSERT(stream->num_wb_info + 1 <= MAX_DWB_PIPES);
>   		stream->writeback_info[stream->num_wb_info++] = *wb_info;
>   	}
>   
> @@ -526,6 +527,11 @@ bool dc_stream_remove_writeback(struct dc *dc,
>   		return false;
>   	}
>   
> +	if (stream->num_wb_info > MAX_DWB_PIPES) {
> +		dm_error("DC: num_wb_info is invalid!\n");
> +		return false;
> +	}
> +
>   //	stream->writeback_info[dwb_pipe_inst].wb_enabled = false;
>   	for (i = 0; i < stream->num_wb_info; i++) {
>   		/*dynamic update*/
> @@ -540,7 +546,8 @@ bool dc_stream_remove_writeback(struct dc *dc,
>   		if (stream->writeback_info[i].wb_enabled) {
>   			if (j < i)
>   				/* trim the array */
> -				stream->writeback_info[j] = stream->writeback_info[i];
> +				memcpy(&stream->writeback_info[j], &stream->writeback_info[i],
> +						sizeof(struct dc_writeback_info));
>   			j++;
>   		}
>   	}

-- 
Hamza