All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v2] media: allegro: add the missed check for v4l2_m2m_ctx_init
@ 2019-12-10  3:15 ` Chuhong Yuan
  0 siblings, 0 replies; 4+ messages in thread
From: Chuhong Yuan @ 2019-12-10  3:15 UTC (permalink / raw)
  Cc: Michael Tretter, Pengutronix Kernel Team, Mauro Carvalho Chehab,
	Greg Kroah-Hartman, Hans Verkuil, linux-media, devel,
	linux-kernel, Chuhong Yuan

allegro_open() misses a check for v4l2_m2m_ctx_init().
Add a check and error handling code to fix it.

Fixes: f20387dfd065 ("media: allegro: add Allegro DVT video IP core driver")
Signed-off-by: Chuhong Yuan <hslester96@gmail.com>
---
Changes in v2:
  - Fix the use-after-free in v1.

 drivers/staging/media/allegro-dvt/allegro-core.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/drivers/staging/media/allegro-dvt/allegro-core.c b/drivers/staging/media/allegro-dvt/allegro-core.c
index 6f0cd0784786..66736beb67af 100644
--- a/drivers/staging/media/allegro-dvt/allegro-core.c
+++ b/drivers/staging/media/allegro-dvt/allegro-core.c
@@ -2270,6 +2270,7 @@ 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)
@@ -2341,6 +2342,14 @@ 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);
+		v4l2_fh_del(&channel->fh);
+		v4l2_fh_exit(&channel->fh);
+		kfree(channel);
+		return ret;
+	}
+
 	return 0;
 }
 
-- 
2.24.0


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [PATCH v2] media: allegro: add the missed check for v4l2_m2m_ctx_init
@ 2019-12-10  3:15 ` Chuhong Yuan
  0 siblings, 0 replies; 4+ messages in thread
From: Chuhong Yuan @ 2019-12-10  3:15 UTC (permalink / raw)
  Cc: devel, Greg Kroah-Hartman, Chuhong Yuan, Michael Tretter,
	linux-kernel, Hans Verkuil, Pengutronix Kernel Team,
	Mauro Carvalho Chehab, linux-media

allegro_open() misses a check for v4l2_m2m_ctx_init().
Add a check and error handling code to fix it.

Fixes: f20387dfd065 ("media: allegro: add Allegro DVT video IP core driver")
Signed-off-by: Chuhong Yuan <hslester96@gmail.com>
---
Changes in v2:
  - Fix the use-after-free in v1.

 drivers/staging/media/allegro-dvt/allegro-core.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/drivers/staging/media/allegro-dvt/allegro-core.c b/drivers/staging/media/allegro-dvt/allegro-core.c
index 6f0cd0784786..66736beb67af 100644
--- a/drivers/staging/media/allegro-dvt/allegro-core.c
+++ b/drivers/staging/media/allegro-dvt/allegro-core.c
@@ -2270,6 +2270,7 @@ 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)
@@ -2341,6 +2342,14 @@ 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);
+		v4l2_fh_del(&channel->fh);
+		v4l2_fh_exit(&channel->fh);
+		kfree(channel);
+		return ret;
+	}
+
 	return 0;
 }
 
-- 
2.24.0

_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [PATCH v2] media: allegro: add the missed check for v4l2_m2m_ctx_init
  2019-12-10  3:15 ` Chuhong Yuan
@ 2019-12-12 11:40   ` Hans Verkuil
  -1 siblings, 0 replies; 4+ messages in thread
From: Hans Verkuil @ 2019-12-12 11:40 UTC (permalink / raw)
  To: Chuhong Yuan
  Cc: Michael Tretter, Pengutronix Kernel Team, Mauro Carvalho Chehab,
	Greg Kroah-Hartman, linux-media, devel

On 12/10/19 4:15 AM, Chuhong Yuan wrote:
> allegro_open() misses a check for v4l2_m2m_ctx_init().
> Add a check and error handling code to fix it.
> 
> Fixes: f20387dfd065 ("media: allegro: add Allegro DVT video IP core driver")
> Signed-off-by: Chuhong Yuan <hslester96@gmail.com>
> ---
> Changes in v2:
>   - Fix the use-after-free in v1.
> 
>  drivers/staging/media/allegro-dvt/allegro-core.c | 9 +++++++++
>  1 file changed, 9 insertions(+)
> 
> diff --git a/drivers/staging/media/allegro-dvt/allegro-core.c b/drivers/staging/media/allegro-dvt/allegro-core.c
> index 6f0cd0784786..66736beb67af 100644
> --- a/drivers/staging/media/allegro-dvt/allegro-core.c
> +++ b/drivers/staging/media/allegro-dvt/allegro-core.c
> @@ -2270,6 +2270,7 @@ 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)
> @@ -2341,6 +2342,14 @@ 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);
> +		v4l2_fh_del(&channel->fh);
> +		v4l2_fh_exit(&channel->fh);

Just move the v4l2_fh_init/add calls to just before the return 0, i.e. when everything
is right. Then you don't need to call del/exit on error.

Also, I see that the result of all the v4l2_ctrl_new* calls isn't checked.

Just after the last v4l2_ctrl_new_std() call you need to check handler->error:
if not 0, then there was an error and you need to call v4l2_ctrl_handler_free
to clean it up.

Regards,

	Hans

> +		kfree(channel);
> +		return ret;
> +	}
> +
>  	return 0;
>  }
>  
> 


^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH v2] media: allegro: add the missed check for v4l2_m2m_ctx_init
@ 2019-12-12 11:40   ` Hans Verkuil
  0 siblings, 0 replies; 4+ messages in thread
From: Hans Verkuil @ 2019-12-12 11:40 UTC (permalink / raw)
  To: Chuhong Yuan
  Cc: devel, Greg Kroah-Hartman, Michael Tretter,
	Pengutronix Kernel Team, Mauro Carvalho Chehab, linux-media

On 12/10/19 4:15 AM, Chuhong Yuan wrote:
> allegro_open() misses a check for v4l2_m2m_ctx_init().
> Add a check and error handling code to fix it.
> 
> Fixes: f20387dfd065 ("media: allegro: add Allegro DVT video IP core driver")
> Signed-off-by: Chuhong Yuan <hslester96@gmail.com>
> ---
> Changes in v2:
>   - Fix the use-after-free in v1.
> 
>  drivers/staging/media/allegro-dvt/allegro-core.c | 9 +++++++++
>  1 file changed, 9 insertions(+)
> 
> diff --git a/drivers/staging/media/allegro-dvt/allegro-core.c b/drivers/staging/media/allegro-dvt/allegro-core.c
> index 6f0cd0784786..66736beb67af 100644
> --- a/drivers/staging/media/allegro-dvt/allegro-core.c
> +++ b/drivers/staging/media/allegro-dvt/allegro-core.c
> @@ -2270,6 +2270,7 @@ 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)
> @@ -2341,6 +2342,14 @@ 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);
> +		v4l2_fh_del(&channel->fh);
> +		v4l2_fh_exit(&channel->fh);

Just move the v4l2_fh_init/add calls to just before the return 0, i.e. when everything
is right. Then you don't need to call del/exit on error.

Also, I see that the result of all the v4l2_ctrl_new* calls isn't checked.

Just after the last v4l2_ctrl_new_std() call you need to check handler->error:
if not 0, then there was an error and you need to call v4l2_ctrl_handler_free
to clean it up.

Regards,

	Hans

> +		kfree(channel);
> +		return ret;
> +	}
> +
>  	return 0;
>  }
>  
> 

_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-12-12 11:40 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-10  3:15 [PATCH v2] media: allegro: add the missed check for v4l2_m2m_ctx_init Chuhong Yuan
2019-12-10  3:15 ` Chuhong Yuan
2019-12-12 11:40 ` Hans Verkuil
2019-12-12 11:40   ` Hans Verkuil

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.