From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:48100 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030757AbeBNT43 (ORCPT ); Wed, 14 Feb 2018 14:56:29 -0500 Subject: Patch "media: v4l2-compat-ioctl32.c: make ctrl_is_pointer work for subdevs" has been added to the 4.14-stable tree To: hverkuil@xs4all.nl, gregkh@linuxfoundation.org, hans.verkuil@cisco.com, hansverk@cisco.com, laurent.pinchart@ideasonboard.com, mchehab@s-opensource.com, sakari.ailus@linux.intel.com Cc: , From: Date: Wed, 14 Feb 2018 20:56:14 +0100 In-Reply-To: <20180214114434.26842-14-hverkuil@xs4all.nl> Message-ID: <15186381746117@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-compat-ioctl32.c: make ctrl_is_pointer work for subdevs to the 4.14-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: media-v4l2-compat-ioctl32.c-make-ctrl_is_pointer-work-for-subdevs.patch and it can be found in the queue-4.14 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From foo@baz Wed Feb 14 20:54:11 CET 2018 From: Hans Verkuil Date: Wed, 14 Feb 2018 12:44:34 +0100 Subject: media: v4l2-compat-ioctl32.c: make ctrl_is_pointer work for subdevs To: stable@vger.kernel.org Cc: linux-media@vger.kernel.org, Hans Verkuil , Mauro Carvalho Chehab Message-ID: <20180214114434.26842-14-hverkuil@xs4all.nl> From: Hans Verkuil commit 273caa260035c03d89ad63d72d8cd3d9e5c5e3f1 upstream. If the device is of type VFL_TYPE_SUBDEV then vdev->ioctl_ops is NULL so the 'if (!ops->vidioc_query_ext_ctrl)' check would crash. Add a test for !ops to the condition. All sub-devices that have controls will use the control framework, so they do not have an equivalent to ops->vidioc_query_ext_ctrl. Returning false if ops is NULL is the correct thing to do here. Fixes: b8c601e8af ("v4l2-compat-ioctl32.c: fix ctrl_is_pointer") Signed-off-by: Hans Verkuil Acked-by: Sakari Ailus Reported-by: Laurent Pinchart Reviewed-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Greg Kroah-Hartman --- drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c +++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c @@ -770,7 +770,7 @@ static inline bool ctrl_is_pointer(struc return ctrl && ctrl->is_ptr; } - if (!ops->vidioc_query_ext_ctrl) + if (!ops || !ops->vidioc_query_ext_ctrl) return false; return !ops->vidioc_query_ext_ctrl(file, fh, &qec) && Patches currently in stable-queue which might be from hverkuil@xs4all.nl are queue-4.14/media-v4l2-compat-ioctl32.c-copy-m.userptr-in-put_v4l2_plane32.patch queue-4.14/media-v4l2-compat-ioctl32.c-avoid-sizeof-type.patch queue-4.14/media-v4l2-compat-ioctl32.c-drop-pr_info-for-unknown-buffer-type.patch queue-4.14/media-v4l2-compat-ioctl32.c-add-missing-vidioc_prepare_buf.patch queue-4.14/media-v4l2-compat-ioctl32.c-refactor-compat-ioctl32-logic.patch queue-4.14/media-v4l2-compat-ioctl32.c-fix-ctrl_is_pointer.patch queue-4.14/media-v4l2-compat-ioctl32.c-move-helper-functions-to-__get-put_v4l2_format32.patch queue-4.14/media-v4l2-compat-ioctl32.c-don-t-copy-back-the-result-for-certain-errors.patch queue-4.14/media-v4l2-compat-ioctl32.c-make-ctrl_is_pointer-work-for-subdevs.patch queue-4.14/media-v4l2-compat-ioctl32.c-fix-the-indentation.patch queue-4.14/media-v4l2-ioctl.c-don-t-copy-back-the-result-for-enotty.patch queue-4.14/media-v4l2-ioctl.c-use-check_fmt-for-enum-g-s-try_fmt.patch queue-4.14/media-v4l2-compat-ioctl32.c-copy-clip-list-in-put_v4l2_window32.patch