Hans Verkuil fac710e45d [media] vb2: fix nasty vb2_thread regression ... The vb2_thread implementation was made generic and was moved from videobuf2-v4l2.c to videobuf2-core.c in commit af3bac1a. Unfortunately that clearly was never tested since it broke read() causing NULL address references. The root cause was confused handling of vb2_buffer vs v4l2_buffer (the pb pointer in various core functions). The v4l2_buffer no longer exists after moving the code into the core and it is no longer needed. However, the vb2_thread code passed a pointer to a vb2_buffer to the core functions were a v4l2_buffer pointer was expected and vb2_thread expected that the vb2_buffer fields would be filled in correctly. This is obviously wrong since v4l2_buffer != vb2_buffer. Note that the pb pointer is a void pointer, so no type-checking took place. This patch fixes this problem: 1) allow pb to be NULL for vb2_core_(d)qbuf. The vb2_thread code will use a NULL pointer here since they don't care about v4l2_buffer anyway. 2) let vb2_core_dqbuf pass back the index of the received buffer. This is all vb2_thread needs: this index is the index into the q->bufs array and vb2_thread just gets the vb2_buffer from there. 3) the fileio->b pointer (that originally contained a v4l2_buffer) is removed altogether since it is no longer needed. Tested with vivid and the cobalt driver. Cc: stable@vger.kernel.org # Kernel >= 4.3 Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Reported-by: Matthias Schwarzott <zzam@gentoo.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>		2016-02-04 09:13:46 -02:00
..
acpi	Merge branches 'acpica', 'acpi-video' and 'acpi-fan'	2016-01-21 00:41:59 +01:00
asm-generic	Merge branch 'akpm' (patches from Andrew)	2016-01-21 12:32:08 -08:00
clocksource
crypto	Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2016-01-22 11:58:43 -08:00
drm	Merge tag 'topic/drm-misc-2016-01-17' of git://anongit.freedesktop.org/drm-intel into drm-next	2016-01-18 07:01:16 +10:00
dt-bindings	ARM: SoC driver updates for v4.5	2016-01-20 18:42:30 -08:00
keys	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into next	2015-12-26 16:06:53 +11:00
kvm
linux	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	2016-01-24 12:50:56 -08:00
math-emu
media	[media] vb2: fix nasty vb2_thread regression	2016-02-04 09:13:46 -02:00
memory
misc
net	net: drop tcp_memcontrol.c	2016-01-20 17:09:18 -08:00
pcmcia
ras
rdma	IB/mlx4: Enable send of RoCE QP1 packets with IP/UDP headers	2016-01-19 15:35:01 -05:00
rxrpc
scsi	Initial roundup of 4.5 merge window patches	2016-01-23 18:45:06 -08:00
soc	ARM: SoC driver updates for v4.5	2016-01-20 18:42:30 -08:00
sound	ALSA: timer: Introduce disconnect op to snd_timer_instance	2016-01-21 17:51:42 +01:00
target	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending	2016-01-20 17:20:53 -08:00
trace	Initial roundup of 4.5 merge window patches	2016-01-23 18:45:06 -08:00
uapi	Some locking and page fault bug fixes from Jan Kara, some ext4	2016-01-22 11:23:35 -08:00
video	omapdss: remove CONFIG_OMAP2_DSS_VENC from omapdss.h	2015-12-29 11:07:46 +02:00
xen	Merge branch 'for-4.5/drivers' of git://git.kernel.dk/linux-block	2016-01-21 18:19:38 -08:00
Kbuild