Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15170025 authored by Federico Fuga's avatar Federico Fuga Committed by Mauro Carvalho Chehab
Browse files

[media] Corrected Oops on omap_vout when no manager is connected 



If no manager is connected to the vout device, the omapvid_init() function
fails. No error condition is checked, and the device is started. Later on,
when irq is serviced, a NULL pointer dereference occurs.
Also, the isr routine must be registered only if no error occurs, otherwise
the isr triggers without the proper setup, and the kernel oops again.
To prevent this, the error condition is checked, and the streamon function
exits with error. Also the isr registration call is moved after the setup
procedure is completed.

Reviewed-by: default avatarPrabhakar Lad <prabhakar.lad@ti.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 01ae7286

drivers/media/platform/omap/omap_vout.c

+10 −4
Original line number Diff line number Diff line
@@ -648,9 +648,12 @@ static void omap_vout_isr(void *arg, unsigned int irqstatus) 


	/* First save the configuration in ovelray structure */

	ret = omapvid_init(vout, addr);

	if (ret)

	if (ret) {

		printk(KERN_ERR VOUT_NAME

			"failed to set overlay info\n");

		goto vout_isr_err;

	}



	/* Enable the pipeline and set the Go bit */

	ret = omapvid_apply_changes(vout);

	if (ret)
@@ -1660,13 +1663,16 @@ static int vidioc_streamon(struct file *file, void *fh, enum v4l2_buf_type i) 
	mask = DISPC_IRQ_VSYNC | DISPC_IRQ_EVSYNC_EVEN | DISPC_IRQ_EVSYNC_ODD

		| DISPC_IRQ_VSYNC2;



	omap_dispc_register_isr(omap_vout_isr, vout, mask);



	/* First save the configuration in ovelray structure */

	ret = omapvid_init(vout, addr);

	if (ret)

	if (ret) {

		v4l2_err(&vout->vid_dev->v4l2_dev,

				"failed to set overlay info\n");

		goto streamon_err1;

	}



	omap_dispc_register_isr(omap_vout_isr, vout, mask);



	/* Enable the pipeline and set the Go bit */

	ret = omapvid_apply_changes(vout);

	if (ret)