Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit e2bde787131a01d0f2ca9baccaf3d107bf6c0c92

Authored by Julia Lawall
Committed by Samuel Ortiz
1 parent 8af5fe3bc5
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 1 changed file with 4 additions and 2 deletions Side-by-side Diff

drivers/mfd/davinci_voicecodec.c
Diff comments   View file @ e2bde78
... ... @@ -94,7 +94,8 @@
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;
... ... @@ -104,7 +105,8 @@
104 105 res = platform_get_resource(pdev, IORESOURCE_DMA, 1);
105 106 if (!res) {
106 107 dev_err(&pdev->dev, "no DMA resource\n");
107   - return -ENXIO;
  108 + ret = -ENXIO;
  109 + goto fail4;
108 110 }
109 111  
110 112 davinci_vc->davinci_vcif.dma_rx_channel = res->start;