diff options
| author | Roel Kluin | 2009-11-04 18:16:25 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2009-12-05 21:41:12 +0100 |
| commit | 0b66cf90371dcd28c6eb98904adb694ae98eb20f (patch) | |
| tree | cd40ec966e16910006cbe01c143210d8f659cc5f /drivers | |
| parent | V4L/DVB (13271a): Fix a badly solved merge conflict (diff) | |
| download | kernel-qcow2-linux-0b66cf90371dcd28c6eb98904adb694ae98eb20f.tar.gz kernel-qcow2-linux-0b66cf90371dcd28c6eb98904adb694ae98eb20f.tar.xz kernel-qcow2-linux-0b66cf90371dcd28c6eb98904adb694ae98eb20f.zip | |
V4L/DVB (13285): vpfe_capture: keep index within bound in vpfe_cropcap()
If vpfe_dev->std_index equals ARRAY_SIZE(vpfe_standards), that is
one too large.
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Acked-by: Muralidharan Karicheri <m-karicheri2@ti.com>
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/video/davinci/vpfe_capture.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/davinci/vpfe_capture.c b/drivers/media/video/davinci/vpfe_capture.c index 402ce43ef38e..6b31e59f47f3 100644 --- a/drivers/media/video/davinci/vpfe_capture.c +++ b/drivers/media/video/davinci/vpfe_capture.c @@ -1577,7 +1577,7 @@ static int vpfe_cropcap(struct file *file, void *priv, v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_cropcap\n"); - if (vpfe_dev->std_index > ARRAY_SIZE(vpfe_standards)) + if (vpfe_dev->std_index >= ARRAY_SIZE(vpfe_standards)) return -EINVAL; memset(crop, 0, sizeof(struct v4l2_cropcap)); |