diff options
| author | YueHaibing <yuehaibing@huawei.com> | 2019-03-14 22:01:24 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-01-27 14:50:35 +0100 |
| commit | 30fd5b16c9081afebe74d4d614fe582ff84ef6b2 (patch) | |
| tree | 113913f269cf9c3fe06df1a6c09899019738017d | |
| parent | 53836b6ec72b0cf4b0a48a22fa3a102e7204339a (diff) | |
| download | linux-30fd5b16c9081afebe74d4d614fe582ff84ef6b2.tar.gz linux-30fd5b16c9081afebe74d4d614fe582ff84ef6b2.tar.bz2 linux-30fd5b16c9081afebe74d4d614fe582ff84ef6b2.zip | |
media: tw5864: Fix possible NULL pointer dereference in tw5864_handle_frame
[ Upstream commit 2e7682ebfc750177a4944eeb56e97a3f05734528 ]
'vb' null check should be done before dereferencing it in
tw5864_handle_frame, otherwise a NULL pointer dereference
may occur.
Fixes: 34d1324edd31 ("[media] pci: Add tw5864 driver")
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/media/pci/tw5864/tw5864-video.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/pci/tw5864/tw5864-video.c b/drivers/media/pci/tw5864/tw5864-video.c index ff2b7da90c08..6c40e60ac993 100644 --- a/drivers/media/pci/tw5864/tw5864-video.c +++ b/drivers/media/pci/tw5864/tw5864-video.c @@ -1395,13 +1395,13 @@ static void tw5864_handle_frame(struct tw5864_h264_frame *frame) input->vb = NULL; spin_unlock_irqrestore(&input->slock, flags); - v4l2_buf = to_vb2_v4l2_buffer(&vb->vb.vb2_buf); - if (!vb) { /* Gone because of disabling */ dev_dbg(&dev->pci->dev, "vb is empty, dropping frame\n"); return; } + v4l2_buf = to_vb2_v4l2_buffer(&vb->vb.vb2_buf); + /* * Check for space. * Mind the overhead of startcode emulation prevention. |