From: Ruoyu Wang <ruoyuw560@gmail.com>
To: Vikash Garodia <quic_vgarodia@quicinc.com>,
Dikshita Agarwal <quic_dikshita@quicinc.com>
Cc: Abhinav Kumar <abhinav.kumar@linux.dev>,
Bryan O'Donoghue <bryan.odonoghue@linaro.org>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org,
linux-kernel@vger.kernel.org, Ruoyu Wang <ruoyuw560@gmail.com>
Subject: [PATCH v2] media: iris: check decoder format allocations
Date: Sat, 6 Jun 2026 16:16:36 +0800 [thread overview]
Message-ID: <20260606081636.3-1-ruoyuw560@gmail.com> (raw)
In-Reply-To: <20260606040736.13-1-ruoyuw560@gmail.com>
iris_vdec_inst_init() allocates source and destination v4l2_format
structures before initializing their fields. Allocation failures would
leave the function dereferencing NULL pointers during instance
initialization.
Allocate the formats into local variables and check each allocation before
assigning them to the instance. If the second allocation fails, free the
first allocation and return -ENOMEM. Store the pointers in the instance
only after both allocations have succeeded so the open path can unwind
cleanly.
Signed-off-by: Ruoyu Wang <ruoyuw560@gmail.com>
---
Changes in v2:
- Allocate the formats into local variables and assign them to the
instance only after both allocations succeed, as requested in review.
drivers/media/platform/qcom/iris/iris_vdec.c | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/drivers/media/platform/qcom/iris/iris_vdec.c b/drivers/media/platform/qcom/iris/iris_vdec.c
index 99d544e2af4f9..837f29f403bb7 100644
--- a/drivers/media/platform/qcom/iris/iris_vdec.c
+++ b/drivers/media/platform/qcom/iris/iris_vdec.c
@@ -19,10 +19,21 @@
int iris_vdec_inst_init(struct iris_inst *inst)
{
struct iris_core *core = inst->core;
+ struct v4l2_format *fmt_src, *fmt_dst;
struct v4l2_format *f;
- inst->fmt_src = kzalloc_obj(*inst->fmt_src);
- inst->fmt_dst = kzalloc_obj(*inst->fmt_dst);
+ fmt_src = kzalloc_obj(*fmt_src);
+ if (!fmt_src)
+ return -ENOMEM;
+
+ fmt_dst = kzalloc_obj(*fmt_dst);
+ if (!fmt_dst) {
+ kfree(fmt_src);
+ return -ENOMEM;
+ }
+
+ inst->fmt_src = fmt_src;
+ inst->fmt_dst = fmt_dst;
inst->fw_min_count = MIN_BUFFERS;
--
2.51.0
next prev parent reply other threads:[~2026-06-06 8:16 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-06-06 4:07 [PATCH] " Ruoyu Wang
2026-06-06 7:35 ` Dmitry Baryshkov
2026-06-06 8:16 ` Ruoyu Wang [this message]
2026-06-06 11:02 ` [PATCH v2] " Dmitry Baryshkov
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=20260606081636.3-1-ruoyuw560@gmail.com \
--to=ruoyuw560@gmail.com \
--cc=abhinav.kumar@linux.dev \
--cc=bryan.odonoghue@linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=quic_dikshita@quicinc.com \
--cc=quic_vgarodia@quicinc.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
all inboxes | Powered by JetHome®