diff options
| author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2014-04-14 10:49:34 -0300 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2014-06-09 13:29:11 +0100 |
| commit | 379da4902351474bb78b6bcf56b531d9ec2b25db (patch) | |
| tree | 67697fb4b2d5e13d91963579cb49bae88666bc54 /drivers/media | |
| parent | 66af111e424ad553c5f6823b53f45a9d2eb11d10 (diff) | |
V4L2: ov7670: fix a wrong index, potentially Oopsing the kernel from user-space
commit cfece5857ca51d1dcdb157017aba226f594e9dcf upstream.
Commit 75e2bdad8901a0b599e01a96229be922eef1e488 "ov7670: allow
configuration of image size, clock speed, and I/O method" uses a wrong
index to iterate an array. Apart from being wrong, it also uses an
unchecked value from user-space, which can cause access to unmapped
memory in the kernel, triggered by a normal desktop user with rights to
use V4L2 devices.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
[bwh: Backported to 3.2:
- Adjust filename
- win_sizes array is static, not per-device]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/ov7670.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/ov7670.c b/drivers/media/video/ov7670.c index 8aa058531280..17125d96297b 100644 --- a/drivers/media/video/ov7670.c +++ b/drivers/media/video/ov7670.c @@ -937,7 +937,7 @@ static int ov7670_enum_framesizes(struct v4l2_subdev *sd, * windows that fall outside that. */ for (i = 0; i < N_WIN_SIZES; i++) { - struct ov7670_win_size *win = &ov7670_win_sizes[index]; + struct ov7670_win_size *win = &ov7670_win_sizes[i]; if (info->min_width && win->width < info->min_width) continue; if (info->min_height && win->height < info->min_height) |