mirror of
https://github.com/torvalds/linux.git
synced 2024-12-06 02:52:22 +00:00
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:
parent
e470d8177e
commit
5c554e6b98
@ -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++) {
|
||||
|
Loading…
Reference in New Issue
Block a user