From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:34921 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751549AbcBMXDb (ORCPT ); Sat, 13 Feb 2016 18:03:31 -0500 Subject: Patch "[media] v4l2-ctrls: arrays are also considered compound controls" has been added to the 4.3-stable tree To: hans.verkuil@cisco.com, gregkh@linuxfoundation.org, mchehab@osg.samsung.com, ricardo.ribalda@gmail.com Cc: , From: Date: Sat, 13 Feb 2016 15:03:29 -0800 Message-ID: <145540460923134@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled [media] v4l2-ctrls: arrays are also considered compound controls to the 4.3-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: v4l2-ctrls-arrays-are-also-considered-compound-controls.patch and it can be found in the queue-4.3 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From 35204e2e84f2dae72012f8ca319659c12f428430 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Mon, 21 Sep 2015 06:14:16 -0300 Subject: [media] v4l2-ctrls: arrays are also considered compound controls From: Hans Verkuil commit 35204e2e84f2dae72012f8ca319659c12f428430 upstream. Array controls weren't skipped when only V4L2_CTRL_FLAG_NEXT_CTRL was provided (so no V4L2_CTRL_FLAG_NEXT_COMPOUND was set). This is wrong since arrays are also considered compound controls (i.e. with more than one value), and applications that do not know about arrays will not be able to handle such controls. Fix the test to include arrays. Signed-off-by: Hans Verkuil Reported-by: Ricardo Ribalda Delgado Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Greg Kroah-Hartman --- drivers/media/v4l2-core/v4l2-ctrls.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/media/v4l2-core/v4l2-ctrls.c +++ b/drivers/media/v4l2-core/v4l2-ctrls.c @@ -2498,7 +2498,7 @@ int v4l2_query_ext_ctrl(struct v4l2_ctrl /* We found a control with the given ID, so just get the next valid one in the list. */ list_for_each_entry_continue(ref, &hdl->ctrl_refs, node) { - is_compound = + is_compound = ref->ctrl->is_array || ref->ctrl->type >= V4L2_CTRL_COMPOUND_TYPES; if (id < ref->ctrl->id && (is_compound & mask) == match) @@ -2512,7 +2512,7 @@ int v4l2_query_ext_ctrl(struct v4l2_ctrl is one, otherwise the first 'if' above would have been true. */ list_for_each_entry(ref, &hdl->ctrl_refs, node) { - is_compound = + is_compound = ref->ctrl->is_array || ref->ctrl->type >= V4L2_CTRL_COMPOUND_TYPES; if (id < ref->ctrl->id && (is_compound & mask) == match) Patches currently in stable-queue which might be from hans.verkuil@cisco.com are queue-4.3/v4l2-ctrls-arrays-are-also-considered-compound-controls.patch queue-4.3/media-v4l2-ctrls-fix-setting-autocluster-to-manual-with-vidioc_s_ctrl.patch queue-4.3/v4l2-compat-ioctl32-fix-alignment-for-arm64.patch queue-4.3/media-v4l2-ctrls-fix-64bit-support-in-get_ctrl.patch