Commit 49a0513c authored by Julia Lawall's avatar Julia Lawall Committed by Mauro Carvalho Chehab
Browse files

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



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: default avatarJulia Lawall <julia@diku.dk>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 0a4524d7

drivers/media/video/davinci/vpbe_display.c

+3 −2
Original line number Diff line number Diff line
@@ -1746,15 +1746,16 @@ static __devinit int vpbe_display_probe(struct platform_device *pdev) 
	for (i = 0; i < VPBE_DISPLAY_MAX_DEVICES; i++) {

		if (register_device(disp_dev->dev[i], disp_dev, pdev)) {

			err = -ENODEV;

			goto probe_out;

			goto probe_out_irq;

		}

	}



	printk(KERN_DEBUG "Successfully completed the probing of vpbe v4l2 device\n");

	return 0;



probe_out:

probe_out_irq:

	free_irq(res->start, disp_dev);

probe_out:

	for (k = 0; k < VPBE_DISPLAY_MAX_DEVICES; k++) {

		/* Get the pointer to the layer object */

		vpbe_display_layer = disp_dev->dev[k];