p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[media] v4l: ti-vpe: zero out reserved fields in try_fmt 

Zero out the reserved formats in v4l2_pix_format_mplane and
v4l2_plane_pix_format members of the returned v4l2_format pointer when passed
through TRY_FMT ioctl.

This ensures that the user doesn't interpret the non-zero fields as some data
passed by the driver, and ensures compliance.

Reviewed-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Archit Taneja <archit@ti.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
Archit Taneja 2014-03-10 04:19:02 -03:00 committed by Mauro Carvalho Chehab
parent 67fb87eec0
commit 92851f1cdb
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/media/platform/ti-vpe/vpe.c
View File

@ -1480,6 +1480,7 @@ static int __vpe_try_fmt(struct vpe_ctx *ctx, struct v4l2_format *f,
} }
} }
memset(pix->reserved, 0, sizeof(pix->reserved));
for (i = 0; i < pix->num_planes; i++) { for (i = 0; i < pix->num_planes; i++) {
plane_fmt = &pix->plane_fmt[i]; plane_fmt = &pix->plane_fmt[i];
depth = fmt->vpdma_fmt[i]->depth; depth = fmt->vpdma_fmt[i]->depth;
@ -1491,6 +1492,8 @@ static int __vpe_try_fmt(struct vpe_ctx *ctx, struct v4l2_format *f,
plane_fmt->sizeimage = plane_fmt->sizeimage =
(pix->height * pix->width * depth) >> 3; (pix->height * pix->width * depth) >> 3;
memset(plane_fmt->reserved, 0, sizeof(plane_fmt->reserved));
} }
return 0; return 0;