leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[media] drivers/media/video/davinci/vpbe_display.c: eliminate a null pointer dereference

Browse Source 
In the original code, probe_out could be reached when res was null and then
when the irq had not yet been requested.  In those cases, the call to
free_irq is not needed, so move probe_out down and introduce a new label
for the case where calling free_irq is useful.

The semantic match that finds this problem is as follows:

// <smpl>
@r@
expression E, E1;
identifier f;
statement S1,S2,S3;
@@

if (E == NULL)
{
  ... when != if (E == NULL || ...) S1 else S2
      when != E = E1
*E->f
  ... when any
  return ...;
}
else S3
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Julia Lawall
2011-10-28 19:58:17 -03:00
committed by Mauro Carvalho Chehab
parent 0a4524d726
commit 49a0513c1f
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/media/video/davinci/vpbe_display.c
View File

@@ -1746,15 +1746,16 @@ static __devinit int vpbe_display_probe(struct platform_device *pdev)
for (i = 0; i < VPBE_DISPLAY_MAX_DEVICES; i++) { for (i = 0; i < VPBE_DISPLAY_MAX_DEVICES; i++) {
if (register_device(disp_dev->dev[i], disp_dev, pdev)) { if (register_device(disp_dev->dev[i], disp_dev, pdev)) {
err = -ENODEV; err = -ENODEV;
goto probe_out; goto probe_out_irq;
} }
} }
printk(KERN_DEBUG "Successfully completed the probing of vpbe v4l2 device\n"); printk(KERN_DEBUG "Successfully completed the probing of vpbe v4l2 device\n");
return 0; return 0;
probe_out: probe_out_irq:
free_irq(res->start, disp_dev); free_irq(res->start, disp_dev);
probe_out:
for (k = 0; k < VPBE_DISPLAY_MAX_DEVICES; k++) { for (k = 0; k < VPBE_DISPLAY_MAX_DEVICES; k++) {
/* Get the pointer to the layer object */ /* Get the pointer to the layer object */
vpbe_display_layer = disp_dev->dev[k]; vpbe_display_layer = disp_dev->dev[k];