projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4f3ca2f
)
V4L/DVB: v4l: soc_camera: fix bound checking of mbus_fmt[] index
author
Baruch Siach
<
[email protected]
>
Fri, 19 Feb 2010 17:09:25 +0000
(14:09 -0300)
committer
Mauro Carvalho Chehab
<
[email protected]
>
Fri, 26 Feb 2010 18:11:11 +0000
(15:11 -0300)
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 <
[email protected]
>
Signed-off-by: Guennadi Liakhovetski <
[email protected]
>
CC:
[email protected]
Signed-off-by: Mauro Carvalho Chehab <
[email protected]
>
drivers/media/video/soc_mediabus.c
patch
|
blob
|
history
diff --git
a/drivers/media/video/soc_mediabus.c
b/drivers/media/video/soc_mediabus.c
index 0149290ee5a6942bc06959a820d106a5b7acd911..8b63b6545e7657827a054505ffd5d109b2c830a2 100644
(file)
--- 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;
}