dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

V4L/DVB (8100): V4L/vivi: fix possible memory leak in vivi_fillbuff 

Move allocation after first check and fix memory leak.

Noticed-by: Daniel Marjamäki <danielm77@spray.se>

Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Marcin Slusarz 2008-06-22 09:11:40 -03:00 committed by Mauro Carvalho Chehab
parent e470d8177e
commit 5c554e6b98
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/media/video/vivi.c
View File

@ -327,13 +327,14 @@ static void vivi_fillbuff(struct vivi_dev *dev, struct vivi_buffer *buf)
int hmax = buf->vb.height;
int wmax = buf->vb.width;
struct timeval ts;
char *tmpbuf = kmalloc(wmax * 2, GFP_ATOMIC);
char *tmpbuf;
void *vbuf = videobuf_to_vmalloc(&buf->vb);
if (!tmpbuf)
if (!vbuf)
return;
if (!vbuf)
tmpbuf = kmalloc(wmax * 2, GFP_ATOMIC);
if (!tmpbuf)
return;
for (h = 0; h < hmax; h++) {