]> git.karo-electronics.de Git - linux-beck.git/commitdiff
[media] vb2: Fix allocation size of dma_parms
authorVincent Stehlé <vincent.stehle@laposte.net>
Mon, 18 Jul 2016 17:54:04 +0000 (14:54 -0300)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Thu, 28 Jul 2016 23:14:28 +0000 (20:14 -0300)
When allocating memory to hold the device dma parameters in
vb2_dma_contig_set_max_seg_size(), the requested size is by mistake only
the size of a pointer. Request the correct size instead.

Fixes: 3f0339691896 ("media: vb2-dma-contig: add helper for setting dma max seg size")
Signed-off-by: Vincent Stehlé <vincent.stehle@laposte.net>
Cc: Sylwester Nawrocki <s.nawrocki@samsung.com>
Acked-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
drivers/media/v4l2-core/videobuf2-dma-contig.c

index 863f658a3fa197301bb635b7b981937a9442e246..fe50a0420c7c9c16ed6a8ecf9d85c24e2a4b21b6 100644 (file)
@@ -749,7 +749,7 @@ EXPORT_SYMBOL_GPL(vb2_dma_contig_memops);
 int vb2_dma_contig_set_max_seg_size(struct device *dev, unsigned int size)
 {
        if (!dev->dma_parms) {
-               dev->dma_parms = kzalloc(sizeof(dev->dma_parms), GFP_KERNEL);
+               dev->dma_parms = kzalloc(sizeof(*dev->dma_parms), GFP_KERNEL);
                if (!dev->dma_parms)
                        return -ENOMEM;
        }