From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D124418452C; Wed, 25 Sep 2024 11:49:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727264979; cv=none; b=blxD5jbyoC8T2nhuVpLCacUNbn/9tTfrl/6XAFu2KvAnMUJhLtoEJGCK3mqAPc9dxLP0EQOyUTx+GBPmYt5GgiHCpgU29e1IpKnHB0u0lPSTZeDw0MjXuz5/6yBgvdgTq3w7lYW2xW6Hltdy/uvo70aKVU5+GXX+MSrGLpSSwUk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727264979; c=relaxed/simple; bh=G6wrazhtqE9S9U3mmGrr+pkS2N+qj/FkmUX/eVX7kBE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ffwOi5h8ATdzQiHg1q1IOdo4vh2JpvjG1BfzIow9WDVXczAeMl/TgPTiJ0dhDn6yqB3M+L9553OQR5/PWw+LrWHLKUUh0gqN+f1G1JwZQ4ozcSvG8v8SwPk4smZttRX7sL+j56emmYw3VDWSD8or7CazXo2smVEAsbgBKlAc8cU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=sIjmNy6m; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="sIjmNy6m" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1D6DCC4CEC3; Wed, 25 Sep 2024 11:49:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1727264979; bh=G6wrazhtqE9S9U3mmGrr+pkS2N+qj/FkmUX/eVX7kBE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sIjmNy6m75VGDJSU1pymht7YEM8U3IueRlLRzSNW/rHflRJJbFVBUnIO6Yc1NScis s5ewzcvIAffPfN0DQUGAho9fYNtrKilMH0RsBmrRcLff8vVyI1LQNjyl38wksmbkXD fKZMhgUNf/mAClYX1RKOFSRPnUlS59I70TjFwy97jXGvDwEhLF90qQpAjFDm5NPRQM hj/6RBU9q3R/tB9P3rXJkCBEHtJKuSIthRebarAiDAyN4mnM45qbEXavR5Qlp86aau hmXrgRQ93hgBinmfBBAyCE9JkN9yGpENl57SnLDoLiFwcCa6Ln15U0Gx546Q2nefY/ 4lG6r2SxmveAA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Srinivasan Shanmugam , Tom Chung , Rodrigo Siqueira , Roman Li , Alex Hung , Aurabindo Pillai , Harry Wentland , Hamza Mahfooz , Alex Deucher , Sasha Levin , sunpeng.li@amd.com, christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@gmail.com, daniel@ffwll.ch, alvin.lee2@amd.com, dillon.varone@amd.com, wenjing.liu@amd.com, joshua.aberback@amd.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 6.11 188/244] drm/amd/display: Implement bounds check for stream encoder creation in DCN401 Date: Wed, 25 Sep 2024 07:26:49 -0400 Message-ID: <20240925113641.1297102-188-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240925113641.1297102-1-sashal@kernel.org> References: <20240925113641.1297102-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.11 Content-Transfer-Encoding: 8bit From: Srinivasan Shanmugam [ Upstream commit bdf606810210e8e07a0cdf1af3c467291363b295 ] 'stream_enc_regs' array is an array of dcn10_stream_enc_registers structures. The array is initialized with four elements, corresponding to the four calls to stream_enc_regs() in the array initializer. This means that valid indices for this array are 0, 1, 2, and 3. The error message 'stream_enc_regs' 4 <= 5 below, is indicating that there is an attempt to access this array with an index of 5, which is out of bounds. This could lead to undefined behavior Here, eng_id is used as an index to access the stream_enc_regs array. If eng_id is 5, this would result in an out-of-bounds access on the stream_enc_regs array. Thus fixing Buffer overflow error in dcn401_stream_encoder_create Found by smatch: drivers/gpu/drm/amd/amdgpu/../display/dc/resource/dcn401/dcn401_resource.c:1209 dcn401_stream_encoder_create() error: buffer overflow 'stream_enc_regs' 4 <= 5 Cc: Tom Chung Cc: Rodrigo Siqueira Cc: Roman Li Cc: Alex Hung Cc: Aurabindo Pillai Cc: Harry Wentland Cc: Hamza Mahfooz Signed-off-by: Srinivasan Shanmugam Reviewed-by: Tom Chung Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- .../gpu/drm/amd/display/dc/resource/dcn401/dcn401_resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/display/dc/resource/dcn401/dcn401_resource.c b/drivers/gpu/drm/amd/display/dc/resource/dcn401/dcn401_resource.c index 34b02147881dd..3e76732ac0dca 100644 --- a/drivers/gpu/drm/amd/display/dc/resource/dcn401/dcn401_resource.c +++ b/drivers/gpu/drm/amd/display/dc/resource/dcn401/dcn401_resource.c @@ -1188,7 +1188,7 @@ static struct stream_encoder *dcn401_stream_encoder_create( vpg = dcn401_vpg_create(ctx, vpg_inst); afmt = dcn401_afmt_create(ctx, afmt_inst); - if (!enc1 || !vpg || !afmt) { + if (!enc1 || !vpg || !afmt || eng_id >= ARRAY_SIZE(stream_enc_regs)) { kfree(enc1); kfree(vpg); kfree(afmt); -- 2.43.0