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 C31FC194C8D; Wed, 25 Sep 2024 11:49:23 +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=1727264963; cv=none; b=L/wpt0drKk/KWsF/RwhyNt0bkj9BpNOk2Msm1HG04PYg0TBy4YTho3kpJozELMgVufw2mzFp8/A7JmgPcTEG+LlybT609U9/1m5mnM4g8pIUne7r1rSjWW1fU52/GSp61XCTYYy1E0QOHjnTtrT8JCbyED1MdKCI/2K7Bng+wk0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727264963; c=relaxed/simple; bh=+qHl4ul+3ParPLZIw4JgXIFDqo1lbPGLQVKjojuAGyU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QTCTWAzLbpV6JVcfwvtkdftFE9HJeaSHQ88V+jZFTB3PuxEna5gtraok23kL91zG9KvnbcXkT+Qn8XFU8lK5XwPKcua3MFU7ySgSmLv6bhWTR/ahNYYdKpyX8wjuIqfSQjdvj9vQf4y6ZA6Lw/D4Wbwe//4YHLo/Ddyiz43wnJo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=W4XNFDQh; 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="W4XNFDQh" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4A367C4CEC3; Wed, 25 Sep 2024 11:49:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1727264963; bh=+qHl4ul+3ParPLZIw4JgXIFDqo1lbPGLQVKjojuAGyU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=W4XNFDQhY21EsyhsrULbgqEFbtM0DRNh/5lp1qlshnrup/un3wAhOH4JaHI3zoWYr RSTxfr3JNSltZVvmGToYk3v7djvT5zB98i2bS48/zxsM+46JXdeZlan1Ive3wkBRD+ usAA/0ebe1nO7SZI/hGjBj0xVEeiRz6LpdArL7TYmgVUO6kWNlT7dUU6CplO2yEb9i uXeXeZvMVLkdn6medksgISop7CgQ1OKNjfUsZqzPKYacBk7NwCPTCKmymU68hOjKU6 5YK4Fq605fQGS/uyegYPRgbCzsLkkvEDr4iVrypsibISHuuKuhgKMe/UNtmRciiQfJ fUgDpEI+q3ubQ== 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, martin.leung@amd.com, harikrishna.revalla@amd.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 6.11 187/244] drm/amd/display: Fix index out of bounds in degamma hardware format translation Date: Wed, 25 Sep 2024 07:26:48 -0400 Message-ID: <20240925113641.1297102-187-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 b7e99058eb2e86aabd7a10761e76cae33d22b49f ] Fixes index out of bounds issue in `cm_helper_translate_curve_to_degamma_hw_format` function. The issue could occur when the index 'i' exceeds the number of transfer function points (TRANSFER_FUNC_POINTS). The fix adds a check to ensure 'i' is within bounds before accessing the transfer function points. If 'i' is out of bounds the function returns false to indicate an error. Reported by smatch: drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_cm_common.c:594 cm_helper_translate_curve_to_degamma_hw_format() error: buffer overflow 'output_tf->tf_pts.red' 1025 <= s32max drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_cm_common.c:595 cm_helper_translate_curve_to_degamma_hw_format() error: buffer overflow 'output_tf->tf_pts.green' 1025 <= s32max drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_cm_common.c:596 cm_helper_translate_curve_to_degamma_hw_format() error: buffer overflow 'output_tf->tf_pts.blue' 1025 <= s32max 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 --- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.c index 0b49362f71b06..eaed5d1c398aa 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.c +++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.c @@ -591,6 +591,8 @@ bool cm_helper_translate_curve_to_degamma_hw_format( i += increment) { if (j == hw_points - 1) break; + if (i >= TRANSFER_FUNC_POINTS) + return false; rgb_resulted[j].red = output_tf->tf_pts.red[i]; rgb_resulted[j].green = output_tf->tf_pts.green[i]; rgb_resulted[j].blue = output_tf->tf_pts.blue[i]; -- 2.43.0