diff options
| author | Federico Fuga <fuga@studiofuga.com> | 2012-08-24 10:54:11 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-03-21 17:31:51 -0400 |
| commit | 15170025ee26946dc61f3c21e54652c6db4a0326 (patch) | |
| tree | c92b31a5e1c00693ba39b567caa872a4ffc73b8d /drivers/media/platform | |
| parent | 01ae72866d31de9291039b6030d021c004f5bfed (diff) | |
[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: Prabhakar Lad <prabhakar.lad@ti.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/platform')
| -rw-r--r-- | drivers/media/platform/omap/omap_vout.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/drivers/media/platform/omap/omap_vout.c b/drivers/media/platform/omap/omap_vout.c index 96c4a17e4280..477268a2415f 100644 --- a/drivers/media/platform/omap/omap_vout.c +++ b/drivers/media/platform/omap/omap_vout.c | |||
| @@ -648,9 +648,12 @@ static void omap_vout_isr(void *arg, unsigned int irqstatus) | |||
| 648 | 648 | ||
| 649 | /* First save the configuration in ovelray structure */ | 649 | /* First save the configuration in ovelray structure */ |
| 650 | ret = omapvid_init(vout, addr); | 650 | ret = omapvid_init(vout, addr); |
| 651 | if (ret) | 651 | if (ret) { |
| 652 | printk(KERN_ERR VOUT_NAME | 652 | printk(KERN_ERR VOUT_NAME |
| 653 | "failed to set overlay info\n"); | 653 | "failed to set overlay info\n"); |
| 654 | goto vout_isr_err; | ||
| 655 | } | ||
| 656 | |||
| 654 | /* Enable the pipeline and set the Go bit */ | 657 | /* Enable the pipeline and set the Go bit */ |
| 655 | ret = omapvid_apply_changes(vout); | 658 | ret = omapvid_apply_changes(vout); |
| 656 | if (ret) | 659 | if (ret) |
| @@ -1660,13 +1663,16 @@ static int vidioc_streamon(struct file *file, void *fh, enum v4l2_buf_type i) | |||
| 1660 | mask = DISPC_IRQ_VSYNC | DISPC_IRQ_EVSYNC_EVEN | DISPC_IRQ_EVSYNC_ODD | 1663 | mask = DISPC_IRQ_VSYNC | DISPC_IRQ_EVSYNC_EVEN | DISPC_IRQ_EVSYNC_ODD |
| 1661 | | DISPC_IRQ_VSYNC2; | 1664 | | DISPC_IRQ_VSYNC2; |
| 1662 | 1665 | ||
| 1663 | omap_dispc_register_isr(omap_vout_isr, vout, mask); | ||
| 1664 | |||
| 1665 | /* First save the configuration in ovelray structure */ | 1666 | /* First save the configuration in ovelray structure */ |
| 1666 | ret = omapvid_init(vout, addr); | 1667 | ret = omapvid_init(vout, addr); |
| 1667 | if (ret) | 1668 | if (ret) { |
| 1668 | v4l2_err(&vout->vid_dev->v4l2_dev, | 1669 | v4l2_err(&vout->vid_dev->v4l2_dev, |
| 1669 | "failed to set overlay info\n"); | 1670 | "failed to set overlay info\n"); |
| 1671 | goto streamon_err1; | ||
| 1672 | } | ||
| 1673 | |||
| 1674 | omap_dispc_register_isr(omap_vout_isr, vout, mask); | ||
| 1675 | |||
| 1670 | /* Enable the pipeline and set the Go bit */ | 1676 | /* Enable the pipeline and set the Go bit */ |
| 1671 | ret = omapvid_apply_changes(vout); | 1677 | ret = omapvid_apply_changes(vout); |
| 1672 | if (ret) | 1678 | if (ret) |