summaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorShuah Khan <shuahkh@osg.samsung.com>2016-03-04 05:24:58 +0300
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-03-05 14:18:21 +0300
commit7e53898a761d192f0ee3e6d6a5dfef0532212754 (patch)
treeeccf1802801cd9f375f6424dd5a877290e222027 /drivers/media
parent1e89f58499f3351a3b3c61dae8213fe3cd24a476 (diff)
downloadlinux-7e53898a761d192f0ee3e6d6a5dfef0532212754.tar.xz
[media] media: fix null pointer dereference in v4l_vb2q_enable_media_source()
Fix the null pointer dereference in v4l_vb2q_enable_media_source(). DVB only drivers don't have valid struct v4l2_fh pointer. [ 548.443272] BUG: unable to handle kernel NULL pointer dereference at 0000000000000010 [ 548.452036] IP: [<ffffffffc020ffc9>] v4l_vb2q_enable_media_source+0x9/0x50 [videodev] [ 548.460792] PGD b820e067 PUD bb3df067 PMD 0 [ 548.465582] Oops: 0000 [#1] SMP Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com> Reported-by: Olli Salonen <olli.salonen@iki.fi> Tested-by: Olli Salonen <olli.salonen@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/v4l2-core/v4l2-mc.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/v4l2-core/v4l2-mc.c b/drivers/media/v4l2-core/v4l2-mc.c
index 7291018cf1bf..f8b6e3be634f 100644
--- a/drivers/media/v4l2-core/v4l2-mc.c
+++ b/drivers/media/v4l2-core/v4l2-mc.c
@@ -240,7 +240,9 @@ int v4l_vb2q_enable_media_source(struct vb2_queue *q)
{
struct v4l2_fh *fh = q->owner;
- return v4l_enable_media_source(fh->vdev);
+ if (fh && fh->vdev)
+ return v4l_enable_media_source(fh->vdev);
+ return 0;
}
EXPORT_SYMBOL_GPL(v4l_vb2q_enable_media_source);