Commit 84f3751d authored by Baruch Siach's avatar Baruch Siach Committed by Mauro Carvalho Chehab

V4L/DVB: v4l: soc_camera: fix bound checking of mbus_fmt[] index

When code <= V4L2_MBUS_FMT_FIXED soc_mbus_get_fmtdesc returns a pointer to
mbus_fmt[x], where x < 0. Fix this.
Signed-off-by: default avatarBaruch Siach <baruch@tkos.co.il>
Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
CC: stable@kernel.org
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 4f3ca2f1
...@@ -149,7 +149,8 @@ EXPORT_SYMBOL(soc_mbus_bytes_per_line); ...@@ -149,7 +149,8 @@ EXPORT_SYMBOL(soc_mbus_bytes_per_line);
const struct soc_mbus_pixelfmt *soc_mbus_get_fmtdesc( const struct soc_mbus_pixelfmt *soc_mbus_get_fmtdesc(
enum v4l2_mbus_pixelcode code) enum v4l2_mbus_pixelcode code)
{ {
if ((unsigned int)(code - V4L2_MBUS_FMT_FIXED) > ARRAY_SIZE(mbus_fmt)) if (code - V4L2_MBUS_FMT_FIXED > ARRAY_SIZE(mbus_fmt) ||
code <= V4L2_MBUS_FMT_FIXED)
return NULL; return NULL;
return mbus_fmt + code - V4L2_MBUS_FMT_FIXED - 1; return mbus_fmt + code - V4L2_MBUS_FMT_FIXED - 1;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment