Commit b62ef37c authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

[media] videobuf2: avoid memory leak on errors

As reported by smatch:
	drivers/media/v4l2-core/videobuf2-core.c:2415 __vb2_init_fileio() warn: possible memory leak of 'fileio'

While here, avoid the usage of sizeof(struct foo_struct).
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 58e1ba3c
...@@ -2406,13 +2406,15 @@ static int __vb2_init_fileio(struct vb2_queue *q, int read) ...@@ -2406,13 +2406,15 @@ static int __vb2_init_fileio(struct vb2_queue *q, int read)
(read) ? "read" : "write", count, q->fileio_read_once, (read) ? "read" : "write", count, q->fileio_read_once,
q->fileio_write_immediately); q->fileio_write_immediately);
fileio = kzalloc(sizeof(struct vb2_fileio_data), GFP_KERNEL); fileio = kzalloc(sizeof(*fileio), GFP_KERNEL);
if (fileio == NULL) if (fileio == NULL)
return -ENOMEM; return -ENOMEM;
fileio->b = kzalloc(q->buf_struct_size, GFP_KERNEL); fileio->b = kzalloc(q->buf_struct_size, GFP_KERNEL);
if (fileio->b == NULL) if (fileio->b == NULL) {
kfree(fileio);
return -ENOMEM; return -ENOMEM;
}
fileio->read_once = q->fileio_read_once; fileio->read_once = q->fileio_read_once;
fileio->write_immediately = q->fileio_write_immediately; fileio->write_immediately = q->fileio_write_immediately;
......
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