From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:52660 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754855AbeBOHnA (ORCPT ); Thu, 15 Feb 2018 02:43:00 -0500 Subject: Patch "media: v4l2-compat-ioctl32: Copy v4l2_window->global_alpha" has been added to the 4.9-stable tree To: hverkuil@xs4all.nl, danielmentz@google.com, gregkh@linuxfoundation.org, hans.verkuil@cisco.com, mchehab@s-opensource.com Cc: , From: Date: Thu, 15 Feb 2018 08:43:01 +0100 In-Reply-To: <20180214114830.27171-10-hverkuil@xs4all.nl> Message-ID: <15186805819183@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: Copy v4l2_window->global_alpha to the 4.9-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-copy-v4l2_window-global_alpha.patch and it can be found in the queue-4.9 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From foo@baz Thu Feb 15 08:41:28 CET 2018 From: Hans Verkuil Date: Wed, 14 Feb 2018 12:48:26 +0100 Subject: media: v4l2-compat-ioctl32: Copy v4l2_window->global_alpha To: stable@vger.kernel.org Cc: linux-media@vger.kernel.org, Daniel Mentz , Hans Verkuil , Mauro Carvalho Chehab Message-ID: <20180214114830.27171-10-hverkuil@xs4all.nl> From: Daniel Mentz commit 025a26fa14f8fd55d50ab284a30c016a5be953d0 upstream. Commit b2787845fb91 ("V4L/DVB (5289): Add support for video output overlays.") added the field global_alpha to struct v4l2_window but did not update the compat layer accordingly. This change adds global_alpha to struct v4l2_window32 and copies the value for global_alpha back and forth. Signed-off-by: Daniel Mentz Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Greg Kroah-Hartman --- drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) --- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c +++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c @@ -45,6 +45,7 @@ struct v4l2_window32 { compat_caddr_t clips; /* actually struct v4l2_clip32 * */ __u32 clipcount; compat_caddr_t bitmap; + __u8 global_alpha; }; static int get_v4l2_window32(struct v4l2_window *kp, struct v4l2_window32 __user *up) @@ -53,7 +54,8 @@ static int get_v4l2_window32(struct v4l2 copy_from_user(&kp->w, &up->w, sizeof(up->w)) || get_user(kp->field, &up->field) || get_user(kp->chromakey, &up->chromakey) || - get_user(kp->clipcount, &up->clipcount)) + get_user(kp->clipcount, &up->clipcount) || + get_user(kp->global_alpha, &up->global_alpha)) return -EFAULT; if (kp->clipcount > 2048) return -EINVAL; @@ -86,7 +88,8 @@ static int put_v4l2_window32(struct v4l2 if (copy_to_user(&up->w, &kp->w, sizeof(kp->w)) || put_user(kp->field, &up->field) || put_user(kp->chromakey, &up->chromakey) || - put_user(kp->clipcount, &up->clipcount)) + put_user(kp->clipcount, &up->clipcount) || + put_user(kp->global_alpha, &up->global_alpha)) return -EFAULT; return 0; } Patches currently in stable-queue which might be from hverkuil@xs4all.nl are queue-4.9/media-v4l2-compat-ioctl32.c-copy-m.userptr-in-put_v4l2_plane32.patch queue-4.9/media-v4l2-compat-ioctl32.c-avoid-sizeof-type.patch queue-4.9/media-v4l2-compat-ioctl32.c-drop-pr_info-for-unknown-buffer-type.patch queue-4.9/media-v4l2-compat-ioctl32.c-add-missing-vidioc_prepare_buf.patch queue-4.9/media-v4l2-compat-ioctl32.c-refactor-compat-ioctl32-logic.patch queue-4.9/media-v4l2-compat-ioctl32.c-fix-ctrl_is_pointer.patch queue-4.9/media-v4l2-compat-ioctl32.c-move-helper-functions-to-__get-put_v4l2_format32.patch queue-4.9/media-v4l2-compat-ioctl32.c-don-t-copy-back-the-result-for-certain-errors.patch queue-4.9/media-v4l2-compat-ioctl32.c-make-ctrl_is_pointer-work-for-subdevs.patch queue-4.9/media-v4l2-compat-ioctl32.c-fix-the-indentation.patch queue-4.9/media-v4l2-compat-ioctl32-copy-v4l2_window-global_alpha.patch queue-4.9/media-v4l2-ioctl.c-don-t-copy-back-the-result-for-enotty.patch queue-4.9/media-v4l2-compat-ioctl32.c-copy-clip-list-in-put_v4l2_window32.patch