From: Michael Tretter <m.tretter@pengutronix.de>
To: Chuhong Yuan <hslester96@gmail.com>
Cc: Pengutronix Kernel Team <kernel@pengutronix.de>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-media@vger.kernel.org, devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v3] media: allegro: add missed checks in allegro_open()
Date: Tue, 21 Jan 2020 09:23:50 +0100 [thread overview]
Message-ID: <20200121092350.466f62a8@litschi.hi.pengutronix.de> (raw)
In-Reply-To: <20200113055951.8718-1-hslester96@gmail.com>
On Mon, 13 Jan 2020 13:59:51 +0800, Chuhong Yuan wrote:
> allegro_open() misses checks for v4l2_m2m_ctx_init() and results of
> v4l2_ctrl_new* calls.
> Add checks and error handlers to fix the problems.
>
> Signed-off-by: Chuhong Yuan <hslester96@gmail.com>
> ---
> Changes in v3:
> - Make code cleaner.
> - Add a check for handler->error.
>
> .../staging/media/allegro-dvt/allegro-core.c | 24 +++++++++++++++----
> 1 file changed, 20 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/staging/media/allegro-dvt/allegro-core.c b/drivers/staging/media/allegro-dvt/allegro-core.c
> index 6f0cd0784786..e86001e42963 100644
> --- a/drivers/staging/media/allegro-dvt/allegro-core.c
> +++ b/drivers/staging/media/allegro-dvt/allegro-core.c
> @@ -2270,15 +2270,12 @@ static int allegro_open(struct file *file)
> struct allegro_channel *channel = NULL;
> struct v4l2_ctrl_handler *handler;
> u64 mask;
> + int ret;
>
> channel = kzalloc(sizeof(*channel), GFP_KERNEL);
> if (!channel)
> return -ENOMEM;
>
> - v4l2_fh_init(&channel->fh, vdev);
> - file->private_data = &channel->fh;
> - v4l2_fh_add(&channel->fh);
> -
> init_completion(&channel->completion);
>
> channel->dev = dev;
> @@ -2328,6 +2325,11 @@ static int allegro_open(struct file *file)
> V4L2_CID_MIN_BUFFERS_FOR_OUTPUT,
> 1, 32,
> 1, 1);
> + if (handler->error != 0) {
> + ret = handler->error;
> + goto error;
> + }
> +
> channel->fh.ctrl_handler = handler;
>
> channel->mcu_channel_id = -1;
> @@ -2341,7 +2343,21 @@ static int allegro_open(struct file *file)
> channel->fh.m2m_ctx = v4l2_m2m_ctx_init(dev->m2m_dev, channel,
> allegro_queue_init);
>
> + if (IS_ERR(channel->fh.m2m_ctx)) {
> + ret = PTR_ERR(channel->fh.m2m_ctx);
> + goto error;
> + }
> +
> + v4l2_fh_init(&channel->fh, vdev);
This call sets channel->fh.ctrl_handler to vdev->ctrl_handler, which
has previously been overriden by the driver to handler. Therefore, this
patch breaks all controls. I think we should initialize channel->fh
before setting any fields of this struct.
Michael
> + file->private_data = &channel->fh;
> + v4l2_fh_add(&channel->fh);
> +
> return 0;
> +
> +error:
> + v4l2_ctrl_handler_free(handler);
> + kfree(channel);
> + return ret;
> }
>
> static int allegro_release(struct file *file)
next prev parent reply other threads:[~2020-01-21 8:23 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-13 5:59 [PATCH v3] media: allegro: add missed checks in allegro_open() Chuhong Yuan
2020-01-21 8:23 ` Michael Tretter [this message]
2020-01-21 11:59 ` Chuhong Yuan
2020-01-21 13:53 ` Michael Tretter
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=20200121092350.466f62a8@litschi.hi.pengutronix.de \
--to=m.tretter@pengutronix.de \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=hslester96@gmail.com \
--cc=kernel@pengutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).