Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55e3f3e6 authored by Daniel Mentz's avatar Daniel Mentz Committed by Greg Kroah-Hartman
Browse files

media: v4l2-compat-ioctl32: Copy v4l2_window->global_alpha 



commit 025a26fa14f8fd55d50ab284a30c016a5be953d0 upstream.

Commit b2787845 ("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: default avatarDaniel Mentz <danielmentz@google.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8465657a

drivers/media/v4l2-core/v4l2-compat-ioctl32.c

+5 −2
Original line number Diff line number Diff line
@@ -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_window *kp, struct v4l2_window32 __user 
	    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_window *kp, struct v4l2_window32 __user 
	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;

}