From: Ezequiel Garcia <ezequiel@collabora.com>
To: Sakari Ailus <sakari.ailus@linux.intel.com>,
linux-media@vger.kernel.org, hverkuil@xs4all.nl
Cc: Thierry Reding <treding@nvidia.com>
Subject: Re: [PATCH 1/1] v4l: ioctl: Validate num_planes before using it
Date: Fri, 15 Feb 2019 12:52:14 -0300 [thread overview]
Message-ID: <672eb573c6da3c509b8e0bbc074fff0de58b326f.camel@collabora.com> (raw)
In-Reply-To: <20190110124319.22230-1-sakari.ailus@linux.intel.com>
On Thu, 2019-01-10 at 14:43 +0200, Sakari Ailus wrote:
> The for loop to reset the memory of the plane reserved fields runs over
> num_planes provided by the user without validating it. Ensure num_planes
> is no more than VIDEO_MAX_PLANES before the loop.
>
> Fixes: 4e1e0eb0e074 ("media: v4l2-ioctl: Zero v4l2_plane_pix_format reserved fields")
> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> ---
> Hi folks,
>
> This patch goes on top of Thierry's patch "media: v4l2-ioctl: Clear only
> per-plane reserved fields".
>
> drivers/media/v4l2-core/v4l2-ioctl.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
> index 392f1228af7b5..9e68a608ac6d3 100644
> --- a/drivers/media/v4l2-core/v4l2-ioctl.c
> +++ b/drivers/media/v4l2-core/v4l2-ioctl.c
> @@ -1551,6 +1551,8 @@ static int v4l_s_fmt(const struct v4l2_ioctl_ops *ops,
> if (unlikely(!ops->vidioc_s_fmt_vid_cap_mplane))
> break;
> CLEAR_AFTER_FIELD(p, fmt.pix_mp.xfer_func);
> + if (p->fmt.pix_mp.num_planes > VIDEO_MAX_PLANES)
> + break;
> for (i = 0; i < p->fmt.pix_mp.num_planes; i++)
> CLEAR_AFTER_FIELD(&p->fmt.pix_mp.plane_fmt[i], bytesperline);
> return ops->vidioc_s_fmt_vid_cap_mplane(file, fh, arg);
> @@ -1581,6 +1583,8 @@ static int v4l_s_fmt(const struct v4l2_ioctl_ops *ops,
> if (unlikely(!ops->vidioc_s_fmt_vid_out_mplane))
> break;
> CLEAR_AFTER_FIELD(p, fmt.pix_mp.xfer_func);
> + if (p->fmt.pix_mp.num_planes > VIDEO_MAX_PLANES)
> + break;
> for (i = 0; i < p->fmt.pix_mp.num_planes; i++)
> CLEAR_AFTER_FIELD(&p->fmt.pix_mp.plane_fmt[i], bytesperline);
> return ops->vidioc_s_fmt_vid_out_mplane(file, fh, arg);
> @@ -1648,6 +1652,8 @@ static int v4l_try_fmt(const struct v4l2_ioctl_ops *ops,
> if (unlikely(!ops->vidioc_try_fmt_vid_cap_mplane))
> break;
> CLEAR_AFTER_FIELD(p, fmt.pix_mp.xfer_func);
> + if (p->fmt.pix_mp.num_planes > VIDEO_MAX_PLANES)
> + break;
> for (i = 0; i < p->fmt.pix_mp.num_planes; i++)
> CLEAR_AFTER_FIELD(&p->fmt.pix_mp.plane_fmt[i], bytesperline);
> return ops->vidioc_try_fmt_vid_cap_mplane(file, fh, arg);
> @@ -1678,6 +1684,8 @@ static int v4l_try_fmt(const struct v4l2_ioctl_ops *ops,
> if (unlikely(!ops->vidioc_try_fmt_vid_out_mplane))
> break;
> CLEAR_AFTER_FIELD(p, fmt.pix_mp.xfer_func);
> + if (p->fmt.pix_mp.num_planes > VIDEO_MAX_PLANES)
> + break;
> for (i = 0; i < p->fmt.pix_mp.num_planes; i++)
> CLEAR_AFTER_FIELD(&p->fmt.pix_mp.plane_fmt[i], bytesperline);
> return ops->vidioc_try_fmt_vid_out_mplane(file, fh, arg);
I'm under the impression this commit is causing the following v4l2-compliance warning:
TRY_FMT cannot handle an invalid pixelformat.
This may or may not be a problem. For more information see:
http://www.mail-archive.com/linux-media@vger.kernel.org/msg56550.html
This applies to try_fmt and s_fmt.
After checking the v4l2 spec, it seems we can only error on a bad type field [1]:
"Drivers should not return an error code unless the type field is invalid".
Perhaps we can clamp num_planes to VIDEO_MAX_PLANES, instead of erroring out?
[1] https://www.kernel.org/doc/html/latest/media/uapi/v4l/vidioc-g-fmt.html
Regards,
Eze
next prev parent reply other threads:[~2019-02-15 15:52 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-10 12:43 [PATCH 1/1] v4l: ioctl: Validate num_planes before using it Sakari Ailus
2019-01-10 12:51 ` Thierry Reding
2019-01-10 13:02 ` Hans Verkuil
2019-01-10 13:30 ` Sakari Ailus
2019-01-10 13:41 ` Sakari Ailus
2019-01-10 14:11 ` Hans Verkuil
2019-01-10 14:18 ` Sakari Ailus
2019-01-10 14:12 ` Hans Verkuil
2019-02-15 15:52 ` Ezequiel Garcia [this message]
2019-02-15 16:05 ` Hans Verkuil
2019-02-15 16:14 ` Ezequiel Garcia
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=672eb573c6da3c509b8e0bbc074fff0de58b326f.camel@collabora.com \
--to=ezequiel@collabora.com \
--cc=hverkuil@xs4all.nl \
--cc=linux-media@vger.kernel.org \
--cc=sakari.ailus@linux.intel.com \
--cc=treding@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).