summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/stk-webcam.c
diff options
context:
space:
mode:
authorDouglas Schilling Landgraf <dougsland@redhat.com>2009-08-10 22:17:25 -0300
committerDouglas Schilling Landgraf <dougsland@redhat.com>2009-08-10 22:17:25 -0300
commitb876feaf9b088d50b7519f8d6bbf15be977cd325 (patch)
tree6541c8c6357f95bdc9b7cec22257f453bd5ed5cf /linux/drivers/media/video/stk-webcam.c
parentd029b650929bd8c6cda3c88135a3b754ca6ae0bb (diff)
downloadmediapointer-dvb-s2-b876feaf9b088d50b7519f8d6bbf15be977cd325.tar.gz
mediapointer-dvb-s2-b876feaf9b088d50b7519f8d6bbf15be977cd325.tar.bz2
stk-webcam: read buffer overflow
From: Roel Kluin <roel.kluin@gmail.com> It tested the value of stk_sizes[i].m before checking whether i was in range. Priority: normal Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Cc: Hans Verkuil <hverkuil@xs4all.nl> Cc: Trent Piepho <xyzzy@speakeasy.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/stk-webcam.c')
-rw-r--r--linux/drivers/media/video/stk-webcam.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/stk-webcam.c b/linux/drivers/media/video/stk-webcam.c
index 849867ab2..aaeee8319 100644
--- a/linux/drivers/media/video/stk-webcam.c
+++ b/linux/drivers/media/video/stk-webcam.c
@@ -1051,8 +1051,8 @@ static int stk_setup_format(struct stk_camera *dev)
depth = 1;
else
depth = 2;
- while (stk_sizes[i].m != dev->vsettings.mode
- && i < ARRAY_SIZE(stk_sizes))
+ while (i < ARRAY_SIZE(stk_sizes) &&
+ stk_sizes[i].m != dev->vsettings.mode)
i++;
if (i == ARRAY_SIZE(stk_sizes)) {
STK_ERROR("Something is broken in %s\n", __func__);