From bee527f97963ece5e3f6e6587402197af889865b Mon Sep 17 00:00:00 2001
From: Pawel Osciak
Date: Mon, 22 Feb 2010 13:10:06 -0300
Subject: [PATCH] V4L/DVB: videobuf: add missing checks for kzalloc returning
NULL
Signed-off-by: Pawel Osciak
Signed-off-by: Mauro Carvalho Chehab
---
drivers/media/video/videobuf-dma-sg.c | 2 ++
drivers/media/video/videobuf-vmalloc.c | 2 ++
2 files changed, 4 insertions(+)
diff --git a/drivers/media/video/videobuf-dma-sg.c b/drivers/media/video/videobuf-dma-sg.c
index fa78555b118b..fcd045e7a1c1 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 d6e6a28fb6b8..136e09383c06 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;
--
2.30.2