diff options
| author | Baruch Siach <baruch@tkos.co.il> | 2010-07-27 12:06:07 (GMT) |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-09-28 01:22:03 (GMT) |
| commit | 5384a12b23160e11ff949a94172051476d308b66 (patch) | |
| tree | 49d1d6cf9c20bcc80fe6f21b31ef19dcbf450620 /drivers/media/video/mx2_camera.c | |
| parent | 1b376dac05058ac5c9616a507d95c19ea5ea2646 (diff) | |
| download | linux-fsl-qoriq-5384a12b23160e11ff949a94172051476d308b66.tar.xz | |
V4L/DVB: mx2_camera: fix a race causing NULL dereference
The mx25_camera_irq irq handler may get called after the camera has been
deactivated (from mx2_camera_deactivate). Detect this situation, and bail out.
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/mx2_camera.c')
| -rw-r--r-- | drivers/media/video/mx2_camera.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/video/mx2_camera.c b/drivers/media/video/mx2_camera.c index 66ff174..b6ea672 100644 --- a/drivers/media/video/mx2_camera.c +++ b/drivers/media/video/mx2_camera.c @@ -378,6 +378,9 @@ static void mx25_camera_frame_done(struct mx2_camera_dev *pcdev, int fb, spin_lock_irqsave(&pcdev->lock, flags); + if (*fb_active == NULL) + goto out; + vb = &(*fb_active)->vb; dev_dbg(pcdev->dev, "%s (vb=0x%p) 0x%08lx %d\n", __func__, vb, vb->baddr, vb->bsize); @@ -402,6 +405,7 @@ static void mx25_camera_frame_done(struct mx2_camera_dev *pcdev, int fb, *fb_active = buf; +out: spin_unlock_irqrestore(&pcdev->lock, flags); } |