Fixes for 5.4

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-5.4/drm-amdgpu-fix-ubsan-warning-in-kv_dpm.c.patch b/queue-5.4/drm-amdgpu-fix-ubsan-warning-in-kv_dpm.c.patch
new file mode 100644 (file)
index 0000000..bb78a34
--- /dev/null
+++ b/queue-5.4/drm-amdgpu-fix-ubsan-warning-in-kv_dpm.c.patch
@@ -0,0 +1,36 @@
+From 1774b1f4224b3b81010e25a470cbc532552c70a5 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Mon, 20 May 2024 09:05:21 -0400
+Subject: drm/amdgpu: fix UBSAN warning in kv_dpm.c
+
+From: Alex Deucher <alexander.deucher@amd.com>
+
+[ Upstream commit f0d576f840153392d04b2d52cf3adab8f62e8cb6 ]
+
+Adds bounds check for sumo_vid_mapping_entry.
+
+Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3392
+Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Cc: stable@vger.kernel.org
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/gpu/drm/amd/amdgpu/kv_dpm.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/kv_dpm.c b/drivers/gpu/drm/amd/amdgpu/kv_dpm.c
+index 6eb6f05c11367..56e15f5bc8225 100644
+--- a/drivers/gpu/drm/amd/amdgpu/kv_dpm.c
++++ b/drivers/gpu/drm/amd/amdgpu/kv_dpm.c
+@@ -163,6 +163,8 @@ static void sumo_construct_vid_mapping_table(struct amdgpu_device *adev,
+ 
+       for (i = 0; i < SUMO_MAX_HARDWARE_POWERLEVELS; i++) {
+               if (table[i].ulSupportedSCLK != 0) {
++                      if (table[i].usVoltageIndex >= SUMO_MAX_NUMBER_VOLTAGES)
++                              continue;
+                       vid_mapping_table->entries[table[i].usVoltageIndex].vid_7bit =
+                               table[i].usVoltageID;
+                       vid_mapping_table->entries[table[i].usVoltageIndex].vid_2bit =
+-- 
+2.43.0
+

diff --git a/queue-5.4/series b/queue-5.4/series
index ab90005915cb97a8e5197af0f1ee2c68b890e844..4dc1b38273cc158d9fcac27e93ccf075d44f62de 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -182,3 +182,4 @@ pinctrl-fix-deadlock-in-create_pinctrl-when-handling.patch
 pinctrl-rockchip-fix-pinmux-bits-for-rk3328-gpio2-b-.patch
 pinctrl-rockchip-fix-pinmux-bits-for-rk3328-gpio3-b-.patch
 pinctrl-rockchip-fix-pinmux-reset-in-rockchip_pmx_se.patch
+drm-amdgpu-fix-ubsan-warning-in-kv_dpm.c.patch