2012-10-03 13:42:46

by Lad, Prabhakar

Subject: [PATCH] media: davinci: vpif: Add return code check at vb2_queue_init()

From: Lad, Prabhakar <[email protected]>

from commit with id 896f38f582730a19eb49677105b4fe4c0270b82e
it's mandatory to check the return code of vb2_queue_init().

Signed-off-by: Lad, Prabhakar <[email protected]>
Signed-off-by: Manjunath Hadli <[email protected]>
Cc: Hans Verkuil <[email protected]>
---
drivers/media/platform/davinci/vpif_capture.c | 8 ++++++--
drivers/media/platform/davinci/vpif_display.c | 8 ++++++--
2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c
index 83b80ba..3521725 100644
--- a/drivers/media/platform/davinci/vpif_capture.c
+++ b/drivers/media/platform/davinci/vpif_capture.c
@@ -976,6 +976,7 @@ static int vpif_reqbufs(struct file *file, void *priv,
struct common_obj *common;
u8 index = 0;
struct vb2_queue *q;
+ int ret;

vpif_dbg(2, debug, "vpif_reqbufs\n");

@@ -1015,8 +1016,11 @@ static int vpif_reqbufs(struct file *file, void *priv,
q->mem_ops = &vb2_dma_contig_memops;
q->buf_struct_size = sizeof(struct vpif_cap_buffer);

- vb2_queue_init(q);
-
+ ret = vb2_queue_init(q);
+ if (ret) {
+ vpif_err("vpif_capture: vb2_queue_init() failed\n");
+ return ret;
+ }
/* Set io allowed member of file handle to TRUE */
fh->io_allowed[index] = 1;
/* Increment io usrs member of channel object to 1 */
diff --git a/drivers/media/platform/davinci/vpif_display.c b/drivers/media/platform/davinci/vpif_display.c
index ae8329d..84cee9d 100644
--- a/drivers/media/platform/davinci/vpif_display.c
+++ b/drivers/media/platform/davinci/vpif_display.c
@@ -936,6 +936,7 @@ static int vpif_reqbufs(struct file *file, void *priv,
enum v4l2_field field;
struct vb2_queue *q;
u8 index = 0;
+ int ret;

/* This file handle has not initialized the channel,
It is not allowed to do settings */
@@ -981,8 +982,11 @@ static int vpif_reqbufs(struct file *file, void *priv,
q->mem_ops = &vb2_dma_contig_memops;
q->buf_struct_size = sizeof(struct vpif_disp_buffer);

- vb2_queue_init(q);
-
+ ret = vb2_queue_init(q);
+ if (ret) {
+ vpif_err("vpif_display: vb2_queue_init() failed\n");
+ return ret;
+ }
/* Set io allowed member of file handle to TRUE */
fh->io_allowed[index] = 1;
/* Increment io usrs member of channel object to 1 */
--
1.7.4.1

2012-10-04 08:52:09

by Hans Verkuil

Subject: Re: [PATCH] media: davinci: vpif: Add return code check at vb2_queue_init()

Hi Prabhakar,

I think this introduces a memory leak, see my comments below.

On Wed 3 October 2012 15:42:29 Prabhakar wrote:
> From: Lad, Prabhakar <[email protected]>
>
> from commit with id 896f38f582730a19eb49677105b4fe4c0270b82e
> it's mandatory to check the return code of vb2_queue_init().
>
> Signed-off-by: Lad, Prabhakar <[email protected]>
> Signed-off-by: Manjunath Hadli <[email protected]>
> Cc: Hans Verkuil <[email protected]>
> ---
> drivers/media/platform/davinci/vpif_capture.c | 8 ++++++--
> drivers/media/platform/davinci/vpif_display.c | 8 ++++++--
> 2 files changed, 12 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c
> index 83b80ba..3521725 100644
> --- a/drivers/media/platform/davinci/vpif_capture.c
> +++ b/drivers/media/platform/davinci/vpif_capture.c
> @@ -976,6 +976,7 @@ static int vpif_reqbufs(struct file *file, void *priv,
> struct common_obj *common;
> u8 index = 0;
> struct vb2_queue *q;
> + int ret;
>
> vpif_dbg(2, debug, "vpif_reqbufs\n");
>
> @@ -1015,8 +1016,11 @@ static int vpif_reqbufs(struct file *file, void *priv,
> q->mem_ops = &vb2_dma_contig_memops;
> q->buf_struct_size = sizeof(struct vpif_cap_buffer);
>
> - vb2_queue_init(q);
> -
> + ret = vb2_queue_init(q);
> + if (ret) {
> + vpif_err("vpif_capture: vb2_queue_init() failed\n");

I think you need to call vb2_dma_contig_cleanup_ctx(common->alloc_ctx); here
to prevent a memory leak.

> + return ret;
> + }
> /* Set io allowed member of file handle to TRUE */
> fh->io_allowed[index] = 1;
> /* Increment io usrs member of channel object to 1 */
> diff --git a/drivers/media/platform/davinci/vpif_display.c b/drivers/media/platform/davinci/vpif_display.c
> index ae8329d..84cee9d 100644
> --- a/drivers/media/platform/davinci/vpif_display.c
> +++ b/drivers/media/platform/davinci/vpif_display.c
> @@ -936,6 +936,7 @@ static int vpif_reqbufs(struct file *file, void *priv,
> enum v4l2_field field;
> struct vb2_queue *q;
> u8 index = 0;
> + int ret;
>
> /* This file handle has not initialized the channel,
> It is not allowed to do settings */
> @@ -981,8 +982,11 @@ static int vpif_reqbufs(struct file *file, void *priv,
> q->mem_ops = &vb2_dma_contig_memops;
> q->buf_struct_size = sizeof(struct vpif_disp_buffer);
>
> - vb2_queue_init(q);
> -
> + ret = vb2_queue_init(q);
> + if (ret) {
> + vpif_err("vpif_display: vb2_queue_init() failed\n");

Ditto.

> + return ret;
> + }
> /* Set io allowed member of file handle to TRUE */
> fh->io_allowed[index] = 1;
> /* Increment io usrs member of channel object to 1 */
>

Regards,

Hans