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

Commit c49148e8 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

[media] v4l: ioctl: Clear the v4l2_pix_format_mplane reserved field 



The S_FMT and TRY_FMT handlers in multiplane mode attempt at clearing
the reserved fields of the v4l2_format structure after the pix_mp
member. However, the reserved fields are inside pix_mp, not after it.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Tested-by: default avatarKieran Bingham <kieran@bingham.xyz>
Acked-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 147fcfca

drivers/media/v4l2-core/v4l2-ioctl.c

+4 −4
Original line number Diff line number Diff line
@@ -1504,7 +1504,7 @@ static int v4l_s_fmt(const struct v4l2_ioctl_ops *ops, 
	case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:

		if (unlikely(!is_rx || !is_vid || !ops->vidioc_s_fmt_vid_cap_mplane))

			break;

		CLEAR_AFTER_FIELD(p, fmt.pix_mp);

		CLEAR_AFTER_FIELD(p, fmt.pix_mp.xfer_func);

		return ops->vidioc_s_fmt_vid_cap_mplane(file, fh, arg);

	case V4L2_BUF_TYPE_VIDEO_OVERLAY:

		if (unlikely(!is_rx || !is_vid || !ops->vidioc_s_fmt_vid_overlay))
@@ -1532,7 +1532,7 @@ static int v4l_s_fmt(const struct v4l2_ioctl_ops *ops, 
	case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:

		if (unlikely(!is_tx || !is_vid || !ops->vidioc_s_fmt_vid_out_mplane))

			break;

		CLEAR_AFTER_FIELD(p, fmt.pix_mp);

		CLEAR_AFTER_FIELD(p, fmt.pix_mp.xfer_func);

		return ops->vidioc_s_fmt_vid_out_mplane(file, fh, arg);

	case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY:

		if (unlikely(!is_tx || !is_vid || !ops->vidioc_s_fmt_vid_out_overlay))
@@ -1589,7 +1589,7 @@ static int v4l_try_fmt(const struct v4l2_ioctl_ops *ops, 
	case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:

		if (unlikely(!is_rx || !is_vid || !ops->vidioc_try_fmt_vid_cap_mplane))

			break;

		CLEAR_AFTER_FIELD(p, fmt.pix_mp);

		CLEAR_AFTER_FIELD(p, fmt.pix_mp.xfer_func);

		return ops->vidioc_try_fmt_vid_cap_mplane(file, fh, arg);

	case V4L2_BUF_TYPE_VIDEO_OVERLAY:

		if (unlikely(!is_rx || !is_vid || !ops->vidioc_try_fmt_vid_overlay))
@@ -1617,7 +1617,7 @@ static int v4l_try_fmt(const struct v4l2_ioctl_ops *ops, 
	case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:

		if (unlikely(!is_tx || !is_vid || !ops->vidioc_try_fmt_vid_out_mplane))

			break;

		CLEAR_AFTER_FIELD(p, fmt.pix_mp);

		CLEAR_AFTER_FIELD(p, fmt.pix_mp.xfer_func);

		return ops->vidioc_try_fmt_vid_out_mplane(file, fh, arg);

	case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY:

		if (unlikely(!is_tx || !is_vid || !ops->vidioc_try_fmt_vid_out_overlay))