From: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
To: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>,
Vikash Garodia <vikash.garodia@oss.qualcomm.com>,
Dikshita Agarwal <dikshita.agarwal@oss.qualcomm.com>,
Abhinav Kumar <abhinav.kumar@linux.dev>,
Bryan O'Donoghue <bod@kernel.org>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Hans Verkuil <hverkuil@kernel.org>,
Stefan Schmidt <stefan.schmidt@linaro.org>,
Vedang Nagar <quic_vnagar@quicinc.com>
Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 4/5] media: iris: reject open() when the session limit is reached
Date: Thu, 30 Jul 2026 18:41:33 +0200 [thread overview]
Message-ID: <0a5e04e3-f42b-4e1f-aede-028258178886@oss.qualcomm.com> (raw)
In-Reply-To: <20260730-iris-fixes-v1-4-413d6cfaa8ca@oss.qualcomm.com>
On 7/30/26 5:26 PM, Dmitry Baryshkov wrote:
> iris_add_session() silently skips adding the instance to core->instances
> once max_session_count is reached, but returns void, so iris_open()
> continues as if it succeeded and hands a file descriptor back to
> userspace. As the instance is not on core->instances, firmware responses
> for it are dropped and every subsequent ioctl times out.
>
> Make iris_add_session() return an error when the limit is reached and
> fail iris_open() accordingly, freeing the partially initialised instance.
>
> Fixes: 38fc8beaba55 ("media: iris: implement reqbuf ioctl with vb2_queue_setup")
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
> Assisted-by: Claude:claude-opus-4-8
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
> ---
> drivers/media/platform/qcom/iris/iris_vidc.c | 14 ++++++++++++--
> 1 file changed, 12 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/media/platform/qcom/iris/iris_vidc.c b/drivers/media/platform/qcom/iris/iris_vidc.c
> index 14d63dc76c9b..b68b98f02e26 100644
> --- a/drivers/media/platform/qcom/iris/iris_vidc.c
> +++ b/drivers/media/platform/qcom/iris/iris_vidc.c
> @@ -39,11 +39,12 @@ static void iris_v4l2_fh_deinit(struct iris_inst *inst, struct file *filp)
> v4l2_fh_exit(&inst->fh);
> }
>
> -static void iris_add_session(struct iris_inst *inst)
> +static int iris_add_session(struct iris_inst *inst)
> {
> struct iris_core *core = inst->core;
> struct iris_inst *iter;
> u32 count = 0;
> + int ret = 0;
>
> mutex_lock(&core->lock);
>
> @@ -52,8 +53,12 @@ static void iris_add_session(struct iris_inst *inst)
>
> if (count < core->iris_platform_data->max_session_count)
> list_add_tail(&inst->list, &core->instances);
> + else
> + ret = -EBUSY;
>
> mutex_unlock(&core->lock);
> +
> + return ret;
Since you already have to resend.. nit:
guard(mutex)(&core->lock)
if (count >= core->iris_platform_data->max_session_count)
return -EBUSY
list_add_tail
return 0;
Konrad
next prev parent reply other threads:[~2026-07-30 16:41 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-30 15:26 [PATCH 0/5] media: iris: several fixes Dmitry Baryshkov
2026-07-30 15:26 ` [PATCH 1/5] media: iris: fail firmware boot on invalid uc_region Dmitry Baryshkov
2026-07-30 15:26 ` [PATCH 2/5] media: iris: take core lock when scanning the instance list Dmitry Baryshkov
2026-07-30 15:26 ` [PATCH 3/5] media: iris: guard against a NULL hfi_sys_ops in the interrupt handler Dmitry Baryshkov
2026-07-30 16:37 ` Konrad Dybcio
2026-07-30 15:26 ` [PATCH 4/5] media: iris: reject open() when the session limit is reached Dmitry Baryshkov
2026-07-30 16:41 ` Konrad Dybcio [this message]
2026-07-30 15:26 ` [PATCH 5/5] media: iris: reference count video instances Dmitry Baryshkov
2026-07-30 16:35 ` Konrad Dybcio
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=0a5e04e3-f42b-4e1f-aede-028258178886@oss.qualcomm.com \
--to=konrad.dybcio@oss.qualcomm.com \
--cc=abhinav.kumar@linux.dev \
--cc=bod@kernel.org \
--cc=dikshita.agarwal@oss.qualcomm.com \
--cc=dmitry.baryshkov@oss.qualcomm.com \
--cc=hverkuil@kernel.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_vnagar@quicinc.com \
--cc=stefan.schmidt@linaro.org \
--cc=vikash.garodia@oss.qualcomm.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®