From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:46376 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756958Ab0D0VWn (ORCPT ); Tue, 27 Apr 2010 17:22:43 -0400 Message-Id: <201004272111.o3RLBPtw019999@imap1.linux-foundation.org> Subject: [patch 07/11] drivers/media/video/et61x251/et61x251_core.c: improve error handling To: mchehab@infradead.org Cc: linux-media@vger.kernel.org, akpm@linux-foundation.org, error27@gmail.com, laurent.pinchart@ideasonboard.com, luca.risolia@studio.unibo.it From: akpm@linux-foundation.org Date: Tue, 27 Apr 2010 14:11:24 -0700 MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: linux-media-owner@vger.kernel.org List-ID: From: Dan Carpenter The original code doesn't handle the situation where the controller is not found. Signed-off-by: Dan Carpenter Cc: Luca Risolia Cc: Mauro Carvalho Chehab Cc: Laurent Pinchart Signed-off-by: Andrew Morton --- drivers/media/video/et61x251/et61x251_core.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff -puN drivers/media/video/et61x251/et61x251_core.c~drivers-media-video-et61x251-et61x251_corec-improve-error-handling drivers/media/video/et61x251/et61x251_core.c --- a/drivers/media/video/et61x251/et61x251_core.c~drivers-media-video-et61x251-et61x251_corec-improve-error-handling +++ a/drivers/media/video/et61x251/et61x251_core.c @@ -1713,7 +1713,7 @@ et61x251_vidioc_s_ctrl(struct et61x251_d 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_d 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; _