| From 5f8d70941e93383c5204b7ba319ddadd66452ba8 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 17 Aug 2023 19:33:49 +0800 |
| Subject: drm/radeon: possible buffer overflow |
| |
| From: Konstantin Meskhidze <konstantin.meskhidze@huawei.com> |
| |
| [ Upstream commit dd05484f99d16715a88eedfca363828ef9a4c2d4 ] |
| |
| Buffer 'afmt_status' of size 6 could overflow, since index 'afmt_idx' is |
| checked after access. |
| |
| Fixes: 5cc4e5fc293b ("drm/radeon: Cleanup HDMI audio interrupt handling for evergreen") |
| Co-developed-by: Ivanov Mikhail <ivanov.mikhail1@huawei-partners.com> |
| Signed-off-by: Konstantin Meskhidze <konstantin.meskhidze@huawei.com> |
| Signed-off-by: Alex Deucher <alexander.deucher@amd.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/gpu/drm/radeon/evergreen.c | 7 ++++--- |
| 1 file changed, 4 insertions(+), 3 deletions(-) |
| |
| diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c |
| index 4f06356d9ce2e..f0ae087be914e 100644 |
| --- a/drivers/gpu/drm/radeon/evergreen.c |
| +++ b/drivers/gpu/drm/radeon/evergreen.c |
| @@ -4821,14 +4821,15 @@ int evergreen_irq_process(struct radeon_device *rdev) |
| break; |
| case 44: /* hdmi */ |
| afmt_idx = src_data; |
| - if (!(afmt_status[afmt_idx] & AFMT_AZ_FORMAT_WTRIG)) |
| - DRM_DEBUG("IH: IH event w/o asserted irq bit?\n"); |
| - |
| if (afmt_idx > 5) { |
| DRM_ERROR("Unhandled interrupt: %d %d\n", |
| src_id, src_data); |
| break; |
| } |
| + |
| + if (!(afmt_status[afmt_idx] & AFMT_AZ_FORMAT_WTRIG)) |
| + DRM_DEBUG("IH: IH event w/o asserted irq bit?\n"); |
| + |
| afmt_status[afmt_idx] &= ~AFMT_AZ_FORMAT_WTRIG; |
| queue_hdmi = true; |
| DRM_DEBUG("IH: HDMI%d\n", afmt_idx + 1); |
| -- |
| 2.42.0 |
| |
