Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'media/v4.6-6' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media fix from Mauro Carvalho Chehab:
"A revert fixing a breakage that caused an OOPS on all VB2-based DVB
drivers.
We already have a proper fix, but it sounds safer to keep it being
tested for a while and not hurry, to avoid the risk of another
regression, specially since this is meant to be c/c to stable. So,
for now, let's just revert the broken patch"
* tag 'media/v4.6-6' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
Revert "[media] videobuf2-v4l2: Verify planes array in buffer dequeueing"
-6
-6
drivers/media/v4l2-core/videobuf2-v4l2.c
-6
drivers/media/v4l2-core/videobuf2-v4l2.c
···
74
74
return 0;
75
75
}
76
76
77
-
static int __verify_planes_array_core(struct vb2_buffer *vb, const void *pb)
78
-
{
79
-
return __verify_planes_array(vb, pb);
80
-
}
81
-
82
77
/**
83
78
* __verify_length() - Verify that the bytesused value for each plane fits in
84
79
* the plane length and that the data offset doesn't exceed the bytesused value.
···
437
442
}
438
443
439
444
static const struct vb2_buf_ops v4l2_buf_ops = {
440
-
.verify_planes_array = __verify_planes_array_core,
441
445
.fill_user_buffer = __fill_v4l2_buffer,
442
446
.fill_vb2_buffer = __fill_vb2_buffer,
443
447
.copy_timestamp = __copy_timestamp,