v4l: ioctl: Validate num_planes before using it
PATCH 1/1 v4l: ioctl: Validate num_planes before using it
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.
---
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(+)
drivers/media/v4l2-core/v4l2-ioctl.c +8 -0
@@ -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);
Signature · 1 line
2.11.0
Quoted 47 lines · Sakari Ailus
The for loop to reset the memory of the plane reserved fields runs over
num_planesprovided by the user without validating it. Ensurenum_planesis no more thanVIDEO_MAX_PLANESbefore the loop.Fixes 4e1e0eb0e074 ("media: v4l2-ioctl: Zero v4l2_plane_pix_format reserved fields")Signed-off-by Sakari Ailus <[email protected]>---
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(+)drivers/media/v4l2-core/v4l2-ioctl.c +6
-0@@ -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);
drivers/media/v4l2-core/v4l2-ioctl.c static int v4l_try_fmt(const struct v4l2_ioctl_ops *ops, · line 1691
Quoted 8 lines
drivers/media/v4l2-core/v4l2-ioctl.c +2
-0@@ -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);
Do we also want to validate the instance in v4l_print_format() before using it?
Quoted 20 lines · Sakari Ailus
The for loop to reset the memory of the plane reserved fields runs over
num_planesprovided by the user without validating it. Ensurenum_planesis no more thanVIDEO_MAX_PLANESbefore the loop.Fixes 4e1e0eb0e074 ("media: v4l2-ioctl: Zero v4l2_plane_pix_format reserved fields")Signed-off-by Sakari Ailus <[email protected]>---
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(+)drivers/media/v4l2-core/v4l2-ioctl.c +0
-0
drivers/media/v4l2-core/v4l2-ioctl.c static int v4l_s_fmt(const struct v4l2_ioctl_ops *ops, · line 1555
Quoted 5 lines
drivers/media/v4l2-core/v4l2-ioctl.c +2
-0@@ -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 ;
I would check this not here but in check_fmt: all *_FMT ioctls call that function first, so it makes sense to do the check there.
v4l_print_format should also be adjusted (take the minimum of num_planes and VIDEO_MAX_PLANES), since it can still be called even if check_fmt returns an error if num_planes is too large.
In fact, the change to v4l_print_format should be a separate patch since that should be backported. It can leak memory in the kernel log if num_planes is too large.
Regards,
Hans
Quoted 31 lines
drivers/media/v4l2-core/v4l2-ioctl.c +6
-0for (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);
Hi Hans,
Quoted 16 lines · Hans Verkuil
Quoted 15 lines · Sakari Ailus
The for loop to reset the memory of the plane reserved fields runs over
num_planesprovided by the user without validating it. Ensurenum_planesis no more thanVIDEO_MAX_PLANESbefore the loop.Fixes 4e1e0eb0e074 ("media: v4l2-ioctl: Zero v4l2_plane_pix_format reserved fields")Signed-off-by Sakari Ailus <[email protected]>---
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(+)
Quoted 13 lines
drivers/media/v4l2-core/v4l2-ioctl.c static int v4l_s_fmt(const struct v4l2_ioctl_ops *ops, · line 1555
Quoted 10 lines
drivers/media/v4l2-core/v4l2-ioctl.c +2
-0@@ -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 ;I would check this not here but in
check_fmt: all*_FMTioctls call that function first, so it makes sense to do the check there.
check_fmt() just takes the buffer type, no more parameters than that. But I'm fine with introducing another function for the purpose, perhaps renaming check_fmt() as check_buf_type().
I'll send v2.
Quoted 8 lines
v4l_print_formatshould also be adjusted (take the minimum ofnum_planesandVIDEO_MAX_PLANES), since it can still be called even ifcheck_fmtreturns an error ifnum_planesis too large.In fact, the change to
v4l_print_formatshould be a separate patch since that should be backported. It can leak memory in the kernel log ifnum_planesis too large.
Yes. I'm trying to figure out the affected versions. The code has been mangled multiple times over the years so it's not entirely trivial.
Quoted 37 lines
Regards,
Hans
Quoted 31 lines
drivers/media/v4l2-core/v4l2-ioctl.c +6
-0for (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);
Signature · 2 lines
Sakari Ailus [email protected]
Quoted 16 lines · Hans Verkuil
Quoted 15 lines · Sakari Ailus
The for loop to reset the memory of the plane reserved fields runs over
num_planesprovided by the user without validating it. Ensurenum_planesis no more thanVIDEO_MAX_PLANESbefore the loop.Fixes 4e1e0eb0e074 ("media: v4l2-ioctl: Zero v4l2_plane_pix_format reserved fields")Signed-off-by Sakari Ailus <[email protected]>---
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(+)
Quoted 13 lines
drivers/media/v4l2-core/v4l2-ioctl.c static int v4l_s_fmt(const struct v4l2_ioctl_ops *ops, · line 1555
Quoted 10 lines
drivers/media/v4l2-core/v4l2-ioctl.c +2
-0@@ -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 ;I would check this not here but in
check_fmt: all*_FMTioctls call that function first, so it makes sense to do the check there.
Even G_FMT? I'm not saying no though. There's just a slight chance of breaking something as it hasn't been a problem to call G_FMT with incorrect number of planes in the mplane format; the number would be overwritten anyway.
Apart from that, this leaves just the four locations --- putting this to a separate function will reduce the calls to that function to just two.
Quoted 45 lines
v4l_print_formatshould also be adjusted (take the minimum ofnum_planesandVIDEO_MAX_PLANES), since it can still be called even ifcheck_fmtreturns an error ifnum_planesis too large.In fact, the change to
v4l_print_formatshould be a separate patch since that should be backported. It can leak memory in the kernel log ifnum_planesis too large.Regards,
Hans
Quoted 31 lines
drivers/media/v4l2-core/v4l2-ioctl.c +6
-0for (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);
Signature · 2 lines
Sakari Ailus [email protected]
Quoted 31 lines · Sakari Ailus
Quoted 16 lines · Hans Verkuil
Quoted 15 lines · Sakari Ailus
The for loop to reset the memory of the plane reserved fields runs over
num_planesprovided by the user without validating it. Ensurenum_planesis no more thanVIDEO_MAX_PLANESbefore the loop.Fixes 4e1e0eb0e074 ("media: v4l2-ioctl: Zero v4l2_plane_pix_format reserved fields")Signed-off-by Sakari Ailus <[email protected]>---
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(+)Quoted 13 lines
drivers/media/v4l2-core/v4l2-ioctl.c static int v4l_s_fmt(const struct v4l2_ioctl_ops *ops, · line 1555
Quoted 10 lines
drivers/media/v4l2-core/v4l2-ioctl.c +2
-0@@ -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 ;I would check this not here but in
check_fmt: all*_FMTioctls call that function first, so it makes sense to do the check there.
Quoted 4 lines
Even
G_FMT? I'm not saying no though. There's just a slight chance of breaking something as it hasn't been a problem to callG_FMTwith incorrect number of planes in the mplane format; the number would be overwritten anyway.
Not G_FMT since everything after the type field is zeroed.
Quoted 2 lines
Apart from that, this leaves just the four locations --- putting this to a separate function will reduce the calls to that function to just two.
I was a bit too quick with my comment about check_fmt. Your original patch is fine.
I'll Ack your patch.
Regards,
Hans
Quoted 47 lines
Quoted 46 lines
v4l_print_formatshould also be adjusted (take the minimum ofnum_planesandVIDEO_MAX_PLANES), since it can still be called even ifcheck_fmtreturns an error ifnum_planesis too large.In fact, the change to
v4l_print_formatshould be a separate patch since that should be backported. It can leak memory in the kernel log ifnum_planesis too large.Regards,
Hans
Quoted 31 lines
drivers/media/v4l2-core/v4l2-ioctl.c +6
-0for (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);
Quoted 39 lines · Hans Verkuil
Quoted 31 lines · Sakari Ailus
Quoted 16 lines · Hans Verkuil
Quoted 15 lines · Sakari Ailus
The for loop to reset the memory of the plane reserved fields runs over
num_planesprovided by the user without validating it. Ensurenum_planesis no more thanVIDEO_MAX_PLANESbefore the loop.Fixes 4e1e0eb0e074 ("media: v4l2-ioctl: Zero v4l2_plane_pix_format reserved fields")Signed-off-by Sakari Ailus <[email protected]>---
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(+)Quoted 13 lines
drivers/media/v4l2-core/v4l2-ioctl.c static int v4l_s_fmt(const struct v4l2_ioctl_ops *ops, · line 1555
Quoted 10 lines
drivers/media/v4l2-core/v4l2-ioctl.c +2
-0@@ -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 ;I would check this not here but in
check_fmt: all*_FMTioctls call that function first, so it makes sense to do the check there.Quoted 4 lines
Even
G_FMT? I'm not saying no though. There's just a slight chance of breaking something as it hasn't been a problem to callG_FMTwith incorrect number of planes in the mplane format; the number would be overwritten anyway.Not
G_FMTsince everything after the type field is zeroed.
Quoted 7 lines
Quoted 2 lines
Apart from that, this leaves just the four locations --- putting this to a separate function will reduce the calls to that function to just two.
I was a bit too quick with my comment about
check_fmt. Your original patch is fine.I'll Ack your patch.
Thanks. Could you pick this to your tree as you did Thierry's patch?
I'll submit the other patch in a moment.
Quoted 53 lines
Regards,
Hans
Quoted 47 lines
Quoted 46 lines
v4l_print_formatshould also be adjusted (take the minimum ofnum_planesandVIDEO_MAX_PLANES), since it can still be called even ifcheck_fmtreturns an error ifnum_planesis too large.In fact, the change to
v4l_print_formatshould be a separate patch since that should be backported. It can leak memory in the kernel log ifnum_planesis too large.Regards,
Hans
Quoted 31 lines
drivers/media/v4l2-core/v4l2-ioctl.c +6
-0for (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);
Signature · 2 lines
Sakari Ailus [email protected]
Quoted 6 lines · Sakari Ailus
The for loop to reset the memory of the plane reserved fields runs over
num_planesprovided by the user without validating it. Ensurenum_planesis no more thanVIDEO_MAX_PLANESbefore the loop.Fixes 4e1e0eb0e074 ("media: v4l2-ioctl: Zero v4l2_plane_pix_format reserved fields")Signed-off-by Sakari Ailus <[email protected]>
Regards,
Hans
Quoted 50 lines
---
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(+)drivers/media/v4l2-core/v4l2-ioctl.c +8
-0@@ -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);
Quoted 47 lines · Sakari Ailus
The for loop to reset the memory of the plane reserved fields runs over
num_planesprovided by the user without validating it. Ensurenum_planesis no more thanVIDEO_MAX_PLANESbefore the loop.Fixes 4e1e0eb0e074 ("media: v4l2-ioctl: Zero v4l2_plane_pix_format reserved fields")Signed-off-by Sakari Ailus <[email protected]>---
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(+)drivers/media/v4l2-core/v4l2-ioctl.c +6
-0@@ -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);
drivers/media/v4l2-core/v4l2-ioctl.c static int v4l_try_fmt(const struct v4l2_ioctl_ops *ops, · line 1691
Quoted 8 lines
drivers/media/v4l2-core/v4l2-ioctl.c +2
-0@@ -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/[email protected]/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
Quoted 63 lines · Ezequiel Garcia
Quoted 47 lines · Sakari Ailus
The for loop to reset the memory of the plane reserved fields runs over
num_planesprovided by the user without validating it. Ensurenum_planesis no more thanVIDEO_MAX_PLANESbefore the loop.Fixes 4e1e0eb0e074 ("media: v4l2-ioctl: Zero v4l2_plane_pix_format reserved fields")Signed-off-by Sakari Ailus <[email protected]>---
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(+)drivers/media/v4l2-core/v4l2-ioctl.c +6
-0@@ -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);drivers/media/v4l2-core/v4l2-ioctl.c static int v4l_try_fmt(const struct v4l2_ioctl_ops *ops, · line 1691
Quoted 8 lines
drivers/media/v4l2-core/v4l2-ioctl.c +2
-0@@ -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_FMTcannot handle an invalid pixelformat.
This may or may not be a problem. For more information see:
http://www.mail-archive.com/[email protected]/msg56550.html
Quoted 7 lines
This applies to
try_fmtands_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_planestoVIDEO_MAX_PLANES, instead of erroring out?
Yes, that would be the right approach.
Ezequiel, can you clamp num_planes and test the patch? And post it if it fixes the warning?
This really should have been caught by testing with e.g. vivid and v4l2-compliance.
Regards,
Hans
Quoted 6 lines
[1] https://www.kernel.org/doc/html/latest/media/uapi/v4l/vidioc-g-fmt.html
Regards,
Eze
Quoted 68 lines · Hans Verkuil
Quoted 67 lines · Ezequiel Garcia
Quoted 47 lines · Sakari Ailus
The for loop to reset the memory of the plane reserved fields runs over
num_planesprovided by the user without validating it. Ensurenum_planesis no more thanVIDEO_MAX_PLANESbefore the loop.Fixes 4e1e0eb0e074 ("media: v4l2-ioctl: Zero v4l2_plane_pix_format reserved fields")Signed-off-by Sakari Ailus <[email protected]>---
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(+)drivers/media/v4l2-core/v4l2-ioctl.c +6
-0@@ -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);drivers/media/v4l2-core/v4l2-ioctl.c static int v4l_try_fmt(const struct v4l2_ioctl_ops *ops, · line 1691
Quoted 8 lines
drivers/media/v4l2-core/v4l2-ioctl.c +2
-0@@ -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_FMTcannot handle an invalid pixelformat.
This may or may not be a problem. For more information see:
http://www.mail-archive.com/[email protected]/msg56550.htmlThis applies to
try_fmtands_fmt.After checking the v4l2 spec, it seems we can only error on a bad type field [1]:
Quoted 9 lines
Quoted 3 lines
"Drivers should not return an error code unless the type field is invalid".
Perhaps we can clamp
num_planestoVIDEO_MAX_PLANES, instead of erroring out?Yes, that would be the right approach.
Ezequiel, can you clamp
num_planesand test the patch? And post it if it fixes the warning?
I can try :-)
Quoted 2 lines
This really should have been caught by testing with e.g. vivid and v4l2-compliance.
We need a CI!
Quoted 9 lines
Regards,
Hans
Quoted 5 lines
[1] https://www.kernel.org/doc/html/latest/media/uapi/v4l/vidioc-g-fmt.html
Regards,
Eze