[media] media: fix null pointer dereference in v4l_vb2q_enable_media_source()
authorShuah Khan <shuahkh@osg.samsung.com>
Fri, 4 Mar 2016 02:24:58 +0000 (23:24 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Sat, 5 Mar 2016 11:18:21 +0000 (08:18 -0300)
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>
drivers/media/v4l2-core/v4l2-mc.c

index 7291018cf1bfd7d5e7f51523bfe44441ed8d924c..f8b6e3be634f976bea1f9c426aae98302530f9ed 100644 (file)
@@ -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);