aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorBaruch Siach <baruch@tkos.co.il>2010-02-19 12:09:25 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2010-03-15 12:06:09 -0400
commitac3da4193bac230e0281508c0cdf530d81b0a458 (patch)
treea2e7527c8cf5e39a59d43803597cd63e7c55c550 /drivers
parent656bb504522676d4a9ebf218c37f7eb966e534ab (diff)
V4L/DVB: v4l: soc_camera: fix bound checking of mbus_fmt[] index
commit 84f3751d6a6f766780dee509433bf7b3dfcdf465 upstream. 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: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/video/soc_mediabus.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/video/soc_mediabus.c b/drivers/media/video/soc_mediabus.c
index f8d5c87dc2aa..a4c0ef4b9d3b 100644
--- a/drivers/media/video/soc_mediabus.c
+++ b/drivers/media/video/soc_mediabus.c
@@ -134,7 +134,8 @@ EXPORT_SYMBOL(soc_mbus_bytes_per_line);
134const struct soc_mbus_pixelfmt *soc_mbus_get_fmtdesc( 134const struct soc_mbus_pixelfmt *soc_mbus_get_fmtdesc(
135 enum v4l2_mbus_pixelcode code) 135 enum v4l2_mbus_pixelcode code)
136{ 136{
137 if ((unsigned int)(code - V4L2_MBUS_FMT_FIXED) > ARRAY_SIZE(mbus_fmt)) 137 if (code - V4L2_MBUS_FMT_FIXED > ARRAY_SIZE(mbus_fmt) ||
138 code <= V4L2_MBUS_FMT_FIXED)
138 return NULL; 139 return NULL;
139 return mbus_fmt + code - V4L2_MBUS_FMT_FIXED - 1; 140 return mbus_fmt + code - V4L2_MBUS_FMT_FIXED - 1;
140} 141}