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

From	Shuah Khan <shuahkh@osg.samsung.com>
Newsgroups	linux.kernel
Subject	[PATCH] media: fix null pointer dereference in v4l_vb2q_enable_media_source()
Date	2016-03-04 03:30 +0100
Message-ID	<r8NF7-8b8-5@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

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>
---
 drivers/media/v4l2-core/v4l2-mc.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/media/v4l2-core/v4l2-mc.c b/drivers/media/v4l2-core/v4l2-mc.c
index 643686d..a39a3cd 100644
--- a/drivers/media/v4l2-core/v4l2-mc.c
+++ b/drivers/media/v4l2-core/v4l2-mc.c
@@ -214,6 +214,8 @@ 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);
-- 
2.5.0

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] media: fix null pointer dereference in v4l_vb2q_enable_media_source() Shuah Khan <shuahkh@osg.samsung.com> - 2016-03-04 03:30 +0100
  Re: [PATCH] media: fix null pointer dereference in v4l_vb2q_enable_media_source() Olli Salonen <olli.salonen@iki.fi> - 2016-03-04 05:40 +0100

csiph-web