From: Greg Kroah-Hartman Date: Mon, 2 May 2016 03:04:52 +0000 (-0700) Subject: delete queue-4.4/videobuf2-v4l2-verify-planes-array-in-buffer-dequeueing.patch X-Git-Tag: v3.14.68~30 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=432313d1a33c42ceadc6e946c0145d1f20d001d3;p=thirdparty%2Fkernel%2Fstable-queue.git delete queue-4.4/videobuf2-v4l2-verify-planes-array-in-buffer-dequeueing.patch --- diff --git a/queue-4.4/series b/queue-4.4/series index 8312baa340f..c0e441fd273 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -92,7 +92,6 @@ asoc-ssm4567-reset-device-before-regcache_sync.patch asoc-dapm-make-sure-we-have-a-card-when-displaying-component-widgets.patch asoc-rt5640-correct-the-digital-interface-data-select.patch vb2-memops-fix-over-allocation-of-frame-vectors.patch -videobuf2-v4l2-verify-planes-array-in-buffer-dequeueing.patch v4l2-dv-timings.h-fix-polarity-for-4k-formats.patch cxl-keep-irq-mappings-on-context-teardown.patch ib-mlx5-expose-correct-max_sge_rd-limit.patch diff --git a/queue-4.4/videobuf2-v4l2-verify-planes-array-in-buffer-dequeueing.patch b/queue-4.4/videobuf2-v4l2-verify-planes-array-in-buffer-dequeueing.patch deleted file mode 100644 index 47115b7ff8c..00000000000 --- a/queue-4.4/videobuf2-v4l2-verify-planes-array-in-buffer-dequeueing.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 2c1f6951a8a82e6de0d82b1158b5e493fc6c54ab Mon Sep 17 00:00:00 2001 -From: Sakari Ailus -Date: Sun, 3 Apr 2016 16:31:03 -0300 -Subject: [media] videobuf2-v4l2: Verify planes array in buffer dequeueing - -From: Sakari Ailus - -commit 2c1f6951a8a82e6de0d82b1158b5e493fc6c54ab upstream. - -When a buffer is being dequeued using VIDIOC_DQBUF IOCTL, the exact buffer -which will be dequeued is not known until the buffer has been removed from -the queue. The number of planes is specific to a buffer, not to the queue. - -This does lead to the situation where multi-plane buffers may be requested -and queued with n planes, but VIDIOC_DQBUF IOCTL may be passed an argument -struct with fewer planes. - -__fill_v4l2_buffer() however uses the number of planes from the dequeued -videobuf2 buffer, overwriting kernel memory (the m.planes array allocated -in video_usercopy() in v4l2-ioctl.c) if the user provided fewer -planes than the dequeued buffer had. Oops! - -Fixes: b0e0e1f83de3 ("[media] media: videobuf2: Prepare to divide videobuf2") - -Signed-off-by: Sakari Ailus -Acked-by: Hans Verkuil -Signed-off-by: Mauro Carvalho Chehab -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/media/v4l2-core/videobuf2-v4l2.c | 6 ++++++ - 1 file changed, 6 insertions(+) - ---- a/drivers/media/v4l2-core/videobuf2-v4l2.c -+++ b/drivers/media/v4l2-core/videobuf2-v4l2.c -@@ -67,6 +67,11 @@ static int __verify_planes_array(struct - return 0; - } - -+static int __verify_planes_array_core(struct vb2_buffer *vb, const void *pb) -+{ -+ return __verify_planes_array(vb, pb); -+} -+ - /** - * __verify_length() - Verify that the bytesused value for each plane fits in - * the plane length and that the data offset doesn't exceed the bytesused value. -@@ -432,6 +437,7 @@ static int __fill_vb2_buffer(struct vb2_ - } - - static const struct vb2_buf_ops v4l2_buf_ops = { -+ .verify_planes_array = __verify_planes_array_core, - .fill_user_buffer = __fill_v4l2_buffer, - .fill_vb2_buffer = __fill_vb2_buffer, - .set_timestamp = __set_timestamp,