diff options
| author | Baruch Siach <baruch@tkos.co.il> | 2010-02-19 14:09:25 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-02-26 15:11:11 -0300 |
| commit | 84f3751d6a6f766780dee509433bf7b3dfcdf465 (patch) | |
| tree | c009fded152e598837a0c48af802ef386c77ac60 | |
| parent | 4f3ca2f152844c5f6ea853077f56d0db877d1f7a (diff) | |
| download | linux-3.10-84f3751d6a6f766780dee509433bf7b3dfcdf465.tar.gz linux-3.10-84f3751d6a6f766780dee509433bf7b3dfcdf465.tar.bz2 linux-3.10-84f3751d6a6f766780dee509433bf7b3dfcdf465.zip | |
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: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
CC: stable@kernel.org
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | drivers/media/video/soc_mediabus.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/video/soc_mediabus.c b/drivers/media/video/soc_mediabus.c index 0149290ee5a..8b63b6545e7 100644 --- a/drivers/media/video/soc_mediabus.c +++ b/drivers/media/video/soc_mediabus.c @@ -149,7 +149,8 @@ EXPORT_SYMBOL(soc_mbus_bytes_per_line); const struct soc_mbus_pixelfmt *soc_mbus_get_fmtdesc( 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 mbus_fmt + code - V4L2_MBUS_FMT_FIXED - 1; } |