hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[media] vb2: core: Skip planes array verification if pb is NULL 

An earlier patch fixing an input validation issue introduced another
issue: vb2_core_dqbuf() is called with pb argument value NULL in some
cases, causing a NULL pointer dereference. Fix this by skipping the
verification as there's nothing to verify.

Fixes: e7e0c3e265 ("[media] videobuf2-core: Check user space planes array in dqbuf")

Signed-off-by: David R <david@unsolicited.net>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Hans Verkuil <hans.verkuil@cisco.com>
Cc: stable@vger.kernel.org # for v4.4 and later
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Sakari Ailus 2016-05-11 18:44:32 -03:00 committed by Mauro Carvalho Chehab
parent 6f0dd24a08
commit 126f402984
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/media/v4l2-core/videobuf2-core.c
View File

@ -1648,7 +1648,7 @@ static int __vb2_get_done_vb(struct vb2_queue *q, struct vb2_buffer **vb,
void *pb, int nonblocking) void *pb, int nonblocking)
{ {
unsigned long flags; unsigned long flags;
int ret; int ret = 0;
/* /*
* Wait for at least one buffer to become available on the done_list. * Wait for at least one buffer to become available on the done_list.
@ -1664,10 +1664,12 @@ static int __vb2_get_done_vb(struct vb2_queue *q, struct vb2_buffer **vb,
spin_lock_irqsave(&q->done_lock, flags); spin_lock_irqsave(&q->done_lock, flags);
*vb = list_first_entry(&q->done_list, struct vb2_buffer, done_entry); *vb = list_first_entry(&q->done_list, struct vb2_buffer, done_entry);
/* /*
* Only remove the buffer from done_list if v4l2_buffer can handle all * Only remove the buffer from done_list if all planes can be
* the planes. * handled. Some cases such as V4L2 file I/O and DVB have pb
* == NULL; skip the check then as there's nothing to verify.
*/ */
ret = call_bufop(q, verify_planes_array, *vb, pb); if (pb)
ret = call_bufop(q, verify_planes_array, *vb, pb);
if (!ret) if (!ret)
list_del(&(*vb)->done_entry); list_del(&(*vb)->done_entry);
spin_unlock_irqrestore(&q->done_lock, flags); spin_unlock_irqrestore(&q->done_lock, flags);