diff options
| author | Dan Carpenter <error27@gmail.com> | 2010-03-28 08:49:45 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-05-19 12:57:26 -0300 |
| commit | 67e13e7709736b3b25dda98f92cc7164b210dda6 (patch) | |
| tree | 983618369e6a79fbdb3f3be2ce16b89315b6593a /drivers/media/video/et61x251 | |
| parent | f24350b48eed2d5518a5f0c2c95d51a655387457 (diff) | |
| download | linux-3.10-67e13e7709736b3b25dda98f92cc7164b210dda6.tar.gz linux-3.10-67e13e7709736b3b25dda98f92cc7164b210dda6.tar.bz2 linux-3.10-67e13e7709736b3b25dda98f92cc7164b210dda6.zip | |
V4L/DVB: video/et61x251: improve error handling
The original code doesn't handle the situation where the controller is
not found.
Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/et61x251')
| -rw-r--r-- | drivers/media/video/et61x251/et61x251_core.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/media/video/et61x251/et61x251_core.c b/drivers/media/video/et61x251/et61x251_core.c index e6c23d50986..a5cfc76b40b 100644 --- a/drivers/media/video/et61x251/et61x251_core.c +++ b/drivers/media/video/et61x251/et61x251_core.c @@ -1713,7 +1713,7 @@ et61x251_vidioc_s_ctrl(struct et61x251_device* cam, void __user * arg) if (copy_from_user(&ctrl, arg, sizeof(ctrl))) return -EFAULT; - for (i = 0; i < ARRAY_SIZE(s->qctrl); i++) + for (i = 0; i < ARRAY_SIZE(s->qctrl); i++) { if (ctrl.id == s->qctrl[i].id) { if (s->qctrl[i].flags & V4L2_CTRL_FLAG_DISABLED) return -EINVAL; @@ -1723,7 +1723,9 @@ et61x251_vidioc_s_ctrl(struct et61x251_device* cam, void __user * arg) ctrl.value -= ctrl.value % s->qctrl[i].step; break; } - + } + if (i == ARRAY_SIZE(s->qctrl)) + return -EINVAL; if ((err = s->set_ctrl(cam, &ctrl))) return err; |