From: Pedro Pontes <pontescpedro@gmail.com>
To: hansg@kernel.org, gregkh@linuxfoundation.org, mchehab@kernel.org
Cc: andy@kernel.org, sakari.ailus@linux.intel.com, kees@kernel.org,
linux-media@vger.kernel.org, linux-staging@lists.linux.dev,
linux-kernel@vger.kernel.org,
Pedro Pontes <pontescpedro@gmail.com>
Subject: [PATCH] media: atomisp: use kmalloc_objs for array allocations
Date: Thu, 16 Apr 2026 10:42:15 -0300 [thread overview]
Message-ID: <20260416134214.130665-2-pontescpedro@gmail.com> (raw)
Convert manual kmalloc() multiplications to the modern kmalloc_objs()
interface to improve type safety and prevent potential integer
overflows.
Signed-off-by: Pedro Pontes <pontescpedro@gmail.com>
---
This patch is a refresh and modernization of the following work by
Qianfeng Rong from August 2025:
Link: https://lore.kernel.org/all/20250821081746.528018-1-rongqianfeng@vivo.com/
The original version used manual multiplications; I have updated it
to use the newer kmalloc_objs() macro and enforced pointer-based
type inference (e.g., *descr->in_info) as is now the preferred
standard for these cleanups.
The patch has been verified with a W=1 build for pci/sh_css.o. Since I
don't own the hardware.
Please note that, since I'm a new contributor, I wasn't quite sure in
how to proceed in this scenario of "redoing" an older contribution.
I've credited the original author with the "Originally-authored-by"
tag. Please let me know if I should have done something differently.
drivers/staging/media/atomisp/pci/sh_css.c | 57 ++++++++++++----------
1 file changed, 30 insertions(+), 27 deletions(-)
diff --git a/drivers/staging/media/atomisp/pci/sh_css.c b/drivers/staging/media/atomisp/pci/sh_css.c
index 6cda5925fa45..26b7ea560c02 100644
--- a/drivers/staging/media/atomisp/pci/sh_css.c
+++ b/drivers/staging/media/atomisp/pci/sh_css.c
@@ -5819,36 +5819,37 @@ static int ia_css_pipe_create_cas_scaler_desc_single_output(
i *= max_scale_factor_per_stage;
}
- descr->in_info = kmalloc(descr->num_stage *
- sizeof(struct ia_css_frame_info),
- GFP_KERNEL);
+ descr->in_info = kmalloc_objs(*descr->in_info,
+ descr->num_stage,
+ GFP_KERNEL);
if (!descr->in_info) {
err = -ENOMEM;
goto ERR;
}
- descr->internal_out_info = kmalloc(descr->num_stage *
- sizeof(struct ia_css_frame_info),
- GFP_KERNEL);
+ descr->internal_out_info = kmalloc_objs(*descr->internal_out_info,
+ descr->num_stage,
+ GFP_KERNEL);
if (!descr->internal_out_info) {
err = -ENOMEM;
goto ERR;
}
- descr->out_info = kmalloc(descr->num_stage *
- sizeof(struct ia_css_frame_info),
- GFP_KERNEL);
+ descr->out_info = kmalloc_objs(*descr->out_info,
+ descr->num_stage,
+ GFP_KERNEL);
if (!descr->out_info) {
err = -ENOMEM;
goto ERR;
}
- descr->vf_info = kmalloc(descr->num_stage *
- sizeof(struct ia_css_frame_info),
- GFP_KERNEL);
+ descr->vf_info = kmalloc_objs(*descr->vf_info,
+ descr->num_stage,
+ GFP_KERNEL);
if (!descr->vf_info) {
err = -ENOMEM;
goto ERR;
}
- descr->is_output_stage = kmalloc(descr->num_stage * sizeof(bool),
- GFP_KERNEL);
+ descr->is_output_stage = kmalloc_objs(*descr->is_output_stage,
+ descr->num_stage,
+ GFP_KERNEL);
if (!descr->is_output_stage) {
err = -ENOMEM;
goto ERR;
@@ -5968,35 +5969,37 @@ ia_css_pipe_create_cas_scaler_desc(struct ia_css_pipe *pipe,
descr->num_stage = num_stages;
- descr->in_info = kmalloc_objs(struct ia_css_frame_info,
- descr->num_stage);
+ descr->in_info = kmalloc_objs(*descr->in_info,
+ descr->num_stage,
+ GFP_KERNEL);
if (!descr->in_info) {
err = -ENOMEM;
goto ERR;
}
- descr->internal_out_info = kmalloc(descr->num_stage *
- sizeof(struct ia_css_frame_info),
- GFP_KERNEL);
+ descr->internal_out_info = kmalloc_objs(*descr->internal_out_info,
+ descr->num_stage,
+ GFP_KERNEL);
if (!descr->internal_out_info) {
err = -ENOMEM;
goto ERR;
}
- descr->out_info = kmalloc(descr->num_stage *
- sizeof(struct ia_css_frame_info),
- GFP_KERNEL);
+ descr->out_info = kmalloc_objs(*descr->out_info,
+ descr->num_stage,
+ GFP_KERNEL);
if (!descr->out_info) {
err = -ENOMEM;
goto ERR;
}
- descr->vf_info = kmalloc(descr->num_stage *
- sizeof(struct ia_css_frame_info),
- GFP_KERNEL);
+ descr->vf_info = kmalloc_objs(*descr->vf_info,
+ descr->num_stage,
+ GFP_KERNEL);
if (!descr->vf_info) {
err = -ENOMEM;
goto ERR;
}
- descr->is_output_stage = kmalloc(descr->num_stage * sizeof(bool),
- GFP_KERNEL);
+ descr->is_output_stage = kmalloc_objs(*descr->is_output_stage,
+ descr->num_stage,
+ GFP_KERNEL);
if (!descr->is_output_stage) {
err = -ENOMEM;
goto ERR;
--
2.53.0
next reply other threads:[~2026-04-16 13:46 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-16 13:42 Pedro Pontes [this message]
2026-04-16 18:26 ` [PATCH] media: atomisp: use kmalloc_objs for array allocations Andy Shevchenko
2026-04-16 20:06 ` Pedro Pontes
2026-04-21 16:52 ` Sakari Ailus
2026-04-21 18:07 ` Andy Shevchenko
2026-04-21 18:09 ` Andy Shevchenko
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=20260416134214.130665-2-pontescpedro@gmail.com \
--to=pontescpedro@gmail.com \
--cc=andy@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=hansg@kernel.org \
--cc=kees@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=mchehab@kernel.org \
--cc=sakari.ailus@linux.intel.com \
/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