From: Hrushiraj Gandhi <hrushirajg23@gmail.com>
To: Felix.Kuehling@amd.com, alexander.deucher@amd.com,
christian.koenig@amd.com
Cc: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
linux-kernel@vger.kernel.org,
Hrushiraj Gandhi <hrushirajg23@gmail.com>
Subject: [PATCH] drm/amdkfd: use kzalloc_objs() instead of kzalloc() with multiply
Date: Tue, 1 Sep 2026 12:56:14 +0530 [thread overview]
Message-ID: <20260901072615.522925-1-hrushirajg23@gmail.com> (raw)
dqm->detect_hang_info, dqm->hung_db_array and dqm->hqd_info are all
allocated with a hand-computed count * sizeof(TYPE) size. If count
were ever attacker- or firmware-influenced and large enough, the
multiply could wrap size_t and produce a too-small allocation that
the code then writes count-many elements into.
kzalloc_objs() computes the same size via size_mul(), which saturates
to SIZE_MAX on overflow instead of wrapping, so the allocation itself
fails cleanly (already handled here via the existing NULL checks)
rather than silently succeeding undersized.
dqm->detect_hang_info_size is left as-is since it is also used later
for a memset() call; only the allocation itself is converted.
No functional change in the non-overflowing case.
Signed-off-by: Hrushiraj Gandhi <hrushirajg23@gmail.com>
---
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
index 67137679a901..5aa42fd5bb49 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
@@ -2013,17 +2013,15 @@ static int start_cpsch(struct device_queue_manager *dqm)
NUM_XCC(dqm->dev->xcc_mask);
dqm->detect_hang_info_size = num_hw_queue_slots * sizeof(struct dqm_detect_hang_info);
- dqm->detect_hang_info = kzalloc(dqm->detect_hang_info_size, GFP_KERNEL);
+ dqm->detect_hang_info = kzalloc_objs(*dqm->detect_hang_info, num_hw_queue_slots);
if (!dqm->detect_hang_info) {
retval = -ENOMEM;
goto fail_detect_hang_buffer;
}
- dqm->hung_db_array = kzalloc(hung_array_size * sizeof(u32), GFP_KERNEL);
- dqm->hqd_info = kzalloc(
- hqd_info_size * sizeof(struct amdgpu_mes_hung_queue_hqd_info),
- GFP_KERNEL);
+ dqm->hung_db_array = kzalloc_objs(*dqm->hung_db_array, hung_array_size);
+ dqm->hqd_info = kzalloc_objs(*dqm->hqd_info, hqd_info_size);
dqm_unlock(dqm);
next reply other threads:[~2026-09-01 7:59 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-01 7:26 Hrushiraj Gandhi [this message]
2026-09-01 7:47 ` [PATCH] drm/amdkfd: use kzalloc_objs() instead of kzalloc() with multiply sashiko-bot
2026-09-01 17:48 ` 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=20260901072615.522925-1-hrushirajg23@gmail.com \
--to=hrushirajg23@gmail.com \
--cc=Felix.Kuehling@amd.com \
--cc=alexander.deucher@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=christian.koenig@amd.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.