Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

mfd: Fix davinci memory leak

Error handling code following a kmalloc should free the allocated data.

The semantic match that finds the problem is as follows:
(http://www.emn.fr/x-info/coccinelle/)

// <smpl>
@r exists@
local idexpression x;
statement S;
expression E;
identifier f,f1,l;
position p1,p2;
expression *ptr != NULL;
@@

x@p1 = \(kmalloc\|kzalloc\|kcalloc\)(...);
...
if (x == NULL) S
<... when != x
when != if (...) { <+...x...+> }
(
x->f1 = E
|
(x->f1 == NULL || ...)
|
f(...,x->f1,...)
)
...>
(
return \(0\|<+...x...+>\|ptr\);
|
return@p2 ...;
)

@script:python@
p1 << r.p1;
p2 << r.p2;
@@

print "* file: %s kmalloc %s return %s" % (p1[0].file,p1[0].line,p2[0].line)
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

authored by

Julia Lawall and committed by
Samuel Ortiz
e2bde787 8af5fe3b

+4 -2
+4 -2
drivers/mfd/davinci_voicecodec.c
··· 94 94 res = platform_get_resource(pdev, IORESOURCE_DMA, 0); 95 95 if (!res) { 96 96 dev_err(&pdev->dev, "no DMA resource\n"); 97 - return -ENXIO; 97 + ret = -ENXIO; 98 + goto fail4; 98 99 } 99 100 100 101 davinci_vc->davinci_vcif.dma_tx_channel = res->start; ··· 105 104 res = platform_get_resource(pdev, IORESOURCE_DMA, 1); 106 105 if (!res) { 107 106 dev_err(&pdev->dev, "no DMA resource\n"); 108 - return -ENXIO; 107 + ret = -ENXIO; 108 + goto fail4; 109 109 } 110 110 111 111 davinci_vc->davinci_vcif.dma_rx_channel = res->start;