From: "Christian König" <christian.koenig@amd.com>
To: Alex Deucher <alexdeucher@gmail.com>
Cc: Nikita Zhandarovich <n.zhandarovich@fintech.ru>,
Alex Deucher <alexander.deucher@amd.com>,
"Pan, Xinhui" <Xinhui.Pan@amd.com>,
linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org,
amd-gfx@lists.freedesktop.org
Subject: Re: [PATCH] drm/radeon/r600_cs: Fix possible int overflows in r600_cs_check_reg()
Date: Thu, 30 Nov 2023 07:41:40 +0100 [thread overview]
Message-ID: <716d82a7-146b-4b67-a434-dd7c32e77d57@amd.com> (raw)
In-Reply-To: <CADnq5_P-Bxghq4N4GXZXUNwGR5BPyU2qQXDYzDeNkvn=VSTfwg@mail.gmail.com>
Am 29.11.23 um 17:03 schrieb Alex Deucher:
> On Wed, Nov 29, 2023 at 10:47 AM Christian König
> <christian.koenig@amd.com> wrote:
>> Am 29.11.23 um 16:22 schrieb Nikita Zhandarovich:
>>> While improbable, there may be a chance of hitting integer
>>> overflow when the result of radeon_get_ib_value() gets shifted
>>> left.
>>>
>>> Avoid it by casting one of the operands to larger data type (u64).
>>>
>>> Found by Linux Verification Center (linuxtesting.org) with static
>>> analysis tool SVACE.
>> Well IIRC cb_color_bo_offset is just 32bits anyway, so this doesn't
>> change anything.
> All of the GPU addresses in the structure are u64. The registers are
> 32 bits which is why they are 256 byte aligned. That said, I think
> the MC on the chips supported by this code are only 32 bits so we
> shouldn't see any addresses greater than 32 bits, but this seems like
> good to do from a coding perspective. Otherwise, we'll keep getting
> this patch.
Just double checked it, in evergreen_cs_track the fields are just
32bits, but in r600_cs_track they are 64bits.
No idea if we every used the full address space, but it's probably a
good point to merge it just to silence the static checker warning.
Christian.
>
> Alex
>
>
> Alex
>
>> Regards,
>> Christian.
>>
>>> Fixes: 1729dd33d20b ("drm/radeon/kms: r600 CS parser fixes")
>>> Signed-off-by: Nikita Zhandarovich <n.zhandarovich@fintech.ru>
>>> ---
>>> drivers/gpu/drm/radeon/r600_cs.c | 4 ++--
>>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/radeon/r600_cs.c b/drivers/gpu/drm/radeon/r600_cs.c
>>> index 638f861af80f..6cf54a747749 100644
>>> --- a/drivers/gpu/drm/radeon/r600_cs.c
>>> +++ b/drivers/gpu/drm/radeon/r600_cs.c
>>> @@ -1275,7 +1275,7 @@ static int r600_cs_check_reg(struct radeon_cs_parser *p, u32 reg, u32 idx)
>>> return -EINVAL;
>>> }
>>> tmp = (reg - CB_COLOR0_BASE) / 4;
>>> - track->cb_color_bo_offset[tmp] = radeon_get_ib_value(p, idx) << 8;
>>> + track->cb_color_bo_offset[tmp] = (u64)radeon_get_ib_value(p, idx) << 8;
>>> ib[idx] += (u32)((reloc->gpu_offset >> 8) & 0xffffffff);
>>> track->cb_color_base_last[tmp] = ib[idx];
>>> track->cb_color_bo[tmp] = reloc->robj;
>>> @@ -1302,7 +1302,7 @@ static int r600_cs_check_reg(struct radeon_cs_parser *p, u32 reg, u32 idx)
>>> "0x%04X\n", reg);
>>> return -EINVAL;
>>> }
>>> - track->htile_offset = radeon_get_ib_value(p, idx) << 8;
>>> + track->htile_offset = (u64)radeon_get_ib_value(p, idx) << 8;
>>> ib[idx] += (u32)((reloc->gpu_offset >> 8) & 0xffffffff);
>>> track->htile_bo = reloc->robj;
>>> track->db_dirty = true;
next prev parent reply other threads:[~2023-11-30 6:46 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-29 15:22 Nikita Zhandarovich
2023-11-29 15:47 ` Christian König
2023-11-29 16:03 ` Alex Deucher
2023-11-30 6:41 ` Christian König [this message]
2023-11-30 17:06 ` Alex Deucher
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=716d82a7-146b-4b67-a434-dd7c32e77d57@amd.com \
--to=christian.koenig@amd.com \
--cc=Xinhui.Pan@amd.com \
--cc=alexander.deucher@amd.com \
--cc=alexdeucher@gmail.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=n.zhandarovich@fintech.ru \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®