diff mbox

[v1,1/4] v4l: add missing checks for kzalloc returning NULL.

Message ID 1266855010-2198-2-git-send-email-p.osciak@samsung.com (mailing list archive)
State Superseded, archived
Headers

Commit Message

Pawel Osciak Feb. 22, 2010, 4:10 p.m. UTC 
  Signed-off-by: Pawel Osciak <p.osciak@samsung.com>
---
 drivers/media/video/videobuf-dma-sg.c  |    2 ++
 drivers/media/video/videobuf-vmalloc.c |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)

Comments

Mauro Carvalho Chehab Feb. 22, 2010, 5:42 p.m. UTC | #1 
Pawel Osciak wrote:
> Signed-off-by: Pawel Osciak <p.osciak@samsung.com>

This one is not dependent on the RFC, and fixes a bug, so I'm applying it.

Thanks for catching it!

Cheers,
Mauro.

> ---
>  drivers/media/video/videobuf-dma-sg.c  |    2 ++
>  drivers/media/video/videobuf-vmalloc.c |    2 ++
>  2 files changed, 4 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/media/video/videobuf-dma-sg.c b/drivers/media/video/videobuf-dma-sg.c
> index fa78555..fcd045e 100644
> --- a/drivers/media/video/videobuf-dma-sg.c
> +++ b/drivers/media/video/videobuf-dma-sg.c
> @@ -418,6 +418,8 @@ static void *__videobuf_alloc(size_t size)
>  	struct videobuf_buffer *vb;
>  
>  	vb = kzalloc(size+sizeof(*mem),GFP_KERNEL);
> +	if (!vb)
> +		return vb;
>  
>  	mem = vb->priv = ((char *)vb)+size;
>  	mem->magic=MAGIC_SG_MEM;
> diff --git a/drivers/media/video/videobuf-vmalloc.c b/drivers/media/video/videobuf-vmalloc.c
> index d6e6a28..136e093 100644
> --- a/drivers/media/video/videobuf-vmalloc.c
> +++ b/drivers/media/video/videobuf-vmalloc.c
> @@ -138,6 +138,8 @@ static void *__videobuf_alloc(size_t size)
>  	struct videobuf_buffer *vb;
>  
>  	vb = kzalloc(size+sizeof(*mem),GFP_KERNEL);
> +	if (!vb)
> +		return vb;
>  
>  	mem = vb->priv = ((char *)vb)+size;
>  	mem->magic=MAGIC_VMAL_MEM;
diff mbox

Patch

diff --git a/drivers/media/video/videobuf-dma-sg.c b/drivers/media/video/videobuf-dma-sg.c
index fa78555..fcd045e 100644
--- a/drivers/media/video/videobuf-dma-sg.c
+++ b/drivers/media/video/videobuf-dma-sg.c
@@ -418,6 +418,8 @@  static void *__videobuf_alloc(size_t size)
 	struct videobuf_buffer *vb;
 
 	vb = kzalloc(size+sizeof(*mem),GFP_KERNEL);
+	if (!vb)
+		return vb;
 
 	mem = vb->priv = ((char *)vb)+size;
 	mem->magic=MAGIC_SG_MEM;
diff --git a/drivers/media/video/videobuf-vmalloc.c b/drivers/media/video/videobuf-vmalloc.c
index d6e6a28..136e093 100644
--- a/drivers/media/video/videobuf-vmalloc.c
+++ b/drivers/media/video/videobuf-vmalloc.c
@@ -138,6 +138,8 @@  static void *__videobuf_alloc(size_t size)
 	struct videobuf_buffer *vb;
 
 	vb = kzalloc(size+sizeof(*mem),GFP_KERNEL);
+	if (!vb)
+		return vb;
 
 	mem = vb->priv = ((char *)vb)+size;
 	mem->magic=MAGIC_VMAL_MEM;