Commit 5c554e6b authored by Marcin Slusarz's avatar Marcin Slusarz Committed by Mauro Carvalho Chehab

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

Move allocation after first check and fix memory leak.
Noticed-by: default avatarDaniel Marjamäki <danielm77@spray.se>
Signed-off-by: default avatarMarcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent e470d817
...@@ -327,13 +327,14 @@ static void vivi_fillbuff(struct vivi_dev *dev, struct vivi_buffer *buf) ...@@ -327,13 +327,14 @@ static void vivi_fillbuff(struct vivi_dev *dev, struct vivi_buffer *buf)
int hmax = buf->vb.height; int hmax = buf->vb.height;
int wmax = buf->vb.width; int wmax = buf->vb.width;
struct timeval ts; struct timeval ts;
char *tmpbuf = kmalloc(wmax * 2, GFP_ATOMIC); char *tmpbuf;
void *vbuf = videobuf_to_vmalloc(&buf->vb); void *vbuf = videobuf_to_vmalloc(&buf->vb);
if (!tmpbuf) if (!vbuf)
return; return;
if (!vbuf) tmpbuf = kmalloc(wmax * 2, GFP_ATOMIC);
if (!tmpbuf)
return; return;
for (h = 0; h < hmax; h++) { for (h = 0; h < hmax; h++) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment