Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-13 01:08:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[media] media: fix null pointer dereference in v4l_vb2q_enable_media_source()

Browse 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>
This commit is contained in:
Shuah Khan 2016-03-03 23:24:58 -03:00 committed by Mauro Carvalho Chehab
parent 1e89f58499
commit 7e53898a76
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/v4l2-core/v4l2-mc.c
View File

@ -240,7 +240,9 @@ int v4l_vb2q_enable_media_source(struct vb2_queue *q)
{ {
struct v4l2_fh *fh = q->owner; 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); EXPORT_SYMBOL_GPL(v4l_vb2q_enable_media_source);